diff --git a/class/core/logs_api.py b/class/core/logs_api.py index e0e859274c..beb2cdb57b 100644 --- a/class/core/logs_api.py +++ b/class/core/logs_api.py @@ -124,10 +124,13 @@ def getAuditLogsFilesApi(self): if log_suffix[0] in ['gz', 'xz', 'bz2', 'asl']: continue - if log_file in ['.', '..', 'faillog', 'fontconfig.log', 'unattended-upgrades', 'tallylog']: + if log_file in ['.', '..']: continue filename = os.path.join(log_dir, log_file) + if not os.path.exists(filename): + continue + if os.path.isfile(filename): file_size = os.path.getsize(filename) if not file_size: diff --git a/plugins/clean/index.py b/plugins/clean/index.py index bff9ed1ec7..465107933b 100755 --- a/plugins/clean/index.py +++ b/plugins/clean/index.py @@ -88,6 +88,7 @@ def initConf(): "/var/log/btmp.*", "/var/log/sa/sa*", "/var/log/sysstat/sa*", + "/var/log/atop/atop*", "/var/log/anaconda/*.log", "/var/log/dpkg.log.*", diff --git a/plugins/mariadb/js/mariadb.js b/plugins/mariadb/js/mariadb.js index 5c3304c3a7..7ab1920090 100755 --- a/plugins/mariadb/js/mariadb.js +++ b/plugins/mariadb/js/mariadb.js @@ -1655,7 +1655,7 @@ function addMasterRepSlaveUser(){ -function updateMasterRepSlaveUser(username){ +function updateMasterRepSlaveUser(username, password){ var index = layer.open({ type: 1, @@ -1668,7 +1668,7 @@ function updateMasterRepSlaveUser(username){
用户名
\
\ 密码\ -
\ +
\
\ \
\ @@ -1844,10 +1844,11 @@ function getMasterRepSlaveList(){ for (i in user_list) { // console.log(i); var name = user_list[i]['username']; + var password = user_list[i]['password']; list += ''+name+'\ - '+user_list[i]['password']+'\ + '+password+'\ \ - 修改 | \ + 修改 | \ 删除 | \ 权限 | \ 从库同步命令\ diff --git a/plugins/mysql-apt/js/mysql-apt.js b/plugins/mysql-apt/js/mysql-apt.js index 830e8a17c9..56ee38ff50 100755 --- a/plugins/mysql-apt/js/mysql-apt.js +++ b/plugins/mysql-apt/js/mysql-apt.js @@ -1707,7 +1707,7 @@ function addMasterRepSlaveUser(){ -function updateMasterRepSlaveUser(username){ +function updateMasterRepSlaveUser(username, password){ var index = layer.open({ type: 1, @@ -1720,7 +1720,7 @@ function updateMasterRepSlaveUser(username){
用户名
\
\ 密码\ -
\ +
\
\ \
\ @@ -1888,10 +1888,11 @@ function getMasterRepSlaveList(){ for (i in user_list) { // console.log(i); var name = user_list[i]['username']; + var password = user_list[i]['password']; list += ''+name+'\ - '+user_list[i]['password']+'\ + '+password+'\ \ - 修改 | \ + 修改 | \ 删除 | \ 权限 | \ 从库同步命令\ diff --git a/plugins/mysql-yum/js/mysql-yum.js b/plugins/mysql-yum/js/mysql-yum.js index 6ec2592cf2..1b12b88c82 100755 --- a/plugins/mysql-yum/js/mysql-yum.js +++ b/plugins/mysql-yum/js/mysql-yum.js @@ -1707,7 +1707,7 @@ function addMasterRepSlaveUser(){ -function updateMasterRepSlaveUser(username){ +function updateMasterRepSlaveUser(username, password){ var index = layer.open({ type: 1, @@ -1720,7 +1720,7 @@ function updateMasterRepSlaveUser(username){
用户名
\
\ 密码\ -
\ +
\
\ \
\ @@ -1888,10 +1888,11 @@ function getMasterRepSlaveList(){ for (i in user_list) { // console.log(i); var name = user_list[i]['username']; + var password = user_list[i]['password']; list += ''+name+'\ - '+user_list[i]['password']+'\ + '+password+'\ \ - 修改 | \ + 修改 | \ 删除 | \ 权限 | \ 从库同步命令\ diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js index a9e446e17e..79e0da90ae 100755 --- a/plugins/mysql/js/mysql.js +++ b/plugins/mysql/js/mysql.js @@ -1707,7 +1707,7 @@ function addMasterRepSlaveUser(){ -function updateMasterRepSlaveUser(username){ +function updateMasterRepSlaveUser(username, password){ var index = layer.open({ type: 1, @@ -1720,7 +1720,7 @@ function updateMasterRepSlaveUser(username){
用户名
\
\ 密码\ -
\ +
\
\ \
\ @@ -1888,10 +1888,11 @@ function getMasterRepSlaveList(){ for (i in user_list) { // console.log(i); var name = user_list[i]['username']; + var password = user_list[i]['password']; list += ''+name+'\ - '+user_list[i]['password']+'\ + '+password+'\ \ - 修改 | \ + 修改 | \ 删除 | \ 权限 | \ 从库同步命令\