diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js index 19279ba07..829b7e26c 100755 --- a/plugins/mysql/js/mysql.js +++ b/plugins/mysql/js/mysql.js @@ -1924,7 +1924,7 @@ function masterOrSlaveConf(version=''){ var rdata = $.parseJSON(data.data); showMsg(rdata.msg ,function(){ getMasterStatus(); - },{ icon: rdata.status ? 1 : 5 },2000); + },{ icon: rdata.status ? 1 : 5 }); }); } }); diff --git a/scripts/backup.py b/scripts/backup.py index e5ce7578d..12f35bbd6 100755 --- a/scripts/backup.py +++ b/scripts/backup.py @@ -112,12 +112,15 @@ class backupTools: if len(mycnf) > 100: mw.writeFile(db_path + '/etc/my.cnf', mycnf) - mw.execShell(db_path + "/bin/mysqldump --opt --default-character-set=utf8 " + - name + " | gzip > " + filename) + # mw.execShell(db_path + "/bin/mysqldump --opt --default-character-set=utf8 " + + # name + " | gzip > " + filename) # mw.execShell(db_path + "/bin/mysqldump --skip-lock-tables --default-character-set=utf8 " + # name + " | gzip > " + filename) + mw.execShell(db_path + "/bin/mysqldump --single-transaction --quick --default-character-set=utf8 " + + name + " | gzip > " + filename) + if not os.path.exists(filename): endDate = time.strftime('%Y/%m/%d %X', time.localtime()) log = "数据库[" + name + "]备份失败!"