From ca1080937db856bafedafb36d51be04b4e6b9907 Mon Sep 17 00:00:00 2001 From: midoks Date: Mon, 2 Jan 2023 11:52:57 +0800 Subject: [PATCH] Update index.py --- plugins/mysql-yum/index.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/mysql-yum/index.py b/plugins/mysql-yum/index.py index a5a89b067..c98ecbb60 100755 --- a/plugins/mysql-yum/index.py +++ b/plugins/mysql-yum/index.py @@ -754,11 +754,13 @@ def importDbExternal(): mysql_cmd = getServerDir() + '/bin/usr/bin/mysql -S ' + sock + ' -uroot -p' + \ pwd + ' ' + name + ' < ' + import_sql - # print(mysql_cmd) - os.system(mysql_cmd) + rdata = mw.execShell(mysql_cmd) if ext != 'sql': os.remove(import_sql) + if rdata[1].lower().find('error') > -1: + return mw.returnJson(False, rdata[1]) + return mw.returnJson(True, 'ok') @@ -783,8 +785,10 @@ def importDbBackup(): mysql_cmd = getServerDir() + '/bin/usr/bin/mysql -S ' + sock + ' -uroot -p' + pwd + \ ' ' + name + ' < ' + file_path_sql - # print(mysql_cmd) - os.system(mysql_cmd) + rdata = mw.execShell(mysql_cmd) + if rdata[1].lower().find('error') > -1: + return mw.returnJson(False, rdata[1]) + return mw.returnJson(True, 'ok')