diff --git a/apps/develop/tasks.py b/apps/develop/tasks.py index df13004f..11702a49 100755 --- a/apps/develop/tasks.py +++ b/apps/develop/tasks.py @@ -19,7 +19,8 @@ def backup_database(): BACKUP_PATH + '/database', name) completed = subprocess.run(command, shell=True, capture_output=True, text=True) - return completed + if completed.returncode != 0: + return completed.stderr @shared_task @@ -49,4 +50,5 @@ def reload_server_only(): def backup_media(): command = 'bash {}/backup_media.sh'.format(SH_PATH) completed = subprocess.run(command, shell=True, capture_output=True, text=True) - return completed + if completed.returncode != 0: + return completed.stderr diff --git a/apps/develop/views.py b/apps/develop/views.py index 5354448e..c8da71ad 100755 --- a/apps/develop/views.py +++ b/apps/develop/views.py @@ -80,11 +80,10 @@ class BackupDatabase(APIView): 备份数据库到指定位置 """ - completed = backup_database() - if completed.returncode == 0: - return Response() - else: - raise APIException(completed.stdout) + err_str = backup_database() + if err_str: + raise APIException(err_str) + return Response() class BackupMedia(APIView): @@ -96,11 +95,10 @@ class BackupMedia(APIView): 备份资源到指定位置 """ - completed = backup_media() - if completed.returncode == 0: - return Response() - else: - raise APIException(completed.stdout) + err_str = backup_database() + if err_str: + raise APIException(err_str) + return Response() class TestViewSet(CustomGenericViewSet):