diff --git a/plugins/mysql/index_mysql.py b/plugins/mysql/index_mysql.py
index 31f132b87..a1357c8d4 100644
--- a/plugins/mysql/index_mysql.py
+++ b/plugins/mysql/index_mysql.py
@@ -63,7 +63,7 @@ def binLogListLook(args):
my_binlog_cmd = my_bin + '/mysqlbinlog'
cmd = my_binlog_cmd + ' --no-defaults --base64-output=decode-rows -vvvv ' + \
- data_dir + '/' + file + '|tail -' + line
+ data_dir + '/' + file + '|tail -' + str(line)
data = mw.execShell(cmd)
diff --git a/plugins/mysql/js/mysql.js b/plugins/mysql/js/mysql.js
index e76b7b9f9..3919958bb 100755
--- a/plugins/mysql/js/mysql.js
+++ b/plugins/mysql/js/mysql.js
@@ -1232,14 +1232,21 @@ function myBinRollingLogs(_name, func, _args, line){
function requestLogs(func,file,line){
myPostCallbakN(func,'',{'file':file,"line":line}, function(rdata){
var data = rdata.data.data;
+ var cmd = rdata.data.cmd;
if(data == '') {
data = '当前没有日志!';
}
+ $('#my_rolling_cmd').html(cmd);
+
+ $('#my_rolling_copy').click(function(){
+ copyText(cmd);
+ });
+
var ebody = '';
$("#my_rolling_logs").html(ebody);
var ob = document.getElementById('roll_info_log');
- ob.scrollTop = ob.scrollHeight;
+ ob.scrollTop = ob.scrollHeight;
});
}
@@ -1253,23 +1260,24 @@ function myBinRollingLogs(_name, func, _args, line){
clearInterval(reqTimer);
}
},
- content:'\
-
',
+ content:'\
+ \
+ \
+
',
success:function(){
var fileName = _args['file'];
- // requestLogs(func,fileName,file_line);
- // reqTimer = setInterval(function(){
- // requestLogs(func,fileName,file_line);
- // },3000);
+ requestLogs(func,fileName,file_line);
+ reqTimer = setInterval(function(){
+ requestLogs(func,fileName,file_line);
+ },3000);
}
});
}