up

plugins/mysql-apt/index.py

@@ -243,11 +243,23 @@ def setSkipGrantTables(v):
 
 
 def getErrorLog():
-    file = getConf()
-    content = mw.readFile(file)
-    rep = 'log-error\s*=\s*(.*)'
-    tmp = re.search(rep, content)
-    return tmp.groups()[0].strip()
+    args = getArgs()
+    path = getDataDir()
+    filename = ''
+    for n in os.listdir(path):
+        if len(n) < 5:
+            continue
+        if n == 'error.log':
+            filename = path + '/' + n
+            break
+    # print filename
+    if not os.path.exists(filename):
+        return mw.returnJson(False, '指定文件不存在!')
+    if 'close' in args:
+        mw.writeFile(filename, '')
+        return mw.returnJson(False, '日志已清空')
+    info = mw.getLastLine(filename, 18)
+    return mw.returnJson(True, 'OK', info)
 
 
 def getShowLogFile():

plugins/mysql-yum/index.py

@@ -234,11 +234,23 @@ def setSkipGrantTables(v):
 
 
 def getErrorLog():
-    file = getConf()
-    content = mw.readFile(file)
-    rep = 'log-error\s*=\s*(.*)'
-    tmp = re.search(rep, content)
-    return tmp.groups()[0].strip()
+    args = getArgs()
+    path = getDataDir()
+    filename = ''
+    for n in os.listdir(path):
+        if len(n) < 5:
+            continue
+        if n == 'error.log':
+            filename = path + '/' + n
+            break
+    # print filename
+    if not os.path.exists(filename):
+        return mw.returnJson(False, '指定文件不存在!')
+    if 'close' in args:
+        mw.writeFile(filename, '')
+        return mw.returnJson(False, '日志已清空')
+    info = mw.getLastLine(filename, 18)
+    return mw.returnJson(True, 'OK', info)
 
 
 def getShowLogFile():

plugins/mysql-yum/js/mysql-yum.js

@@ -1220,7 +1220,7 @@ function myLogs(){
         var limitCon = '<p class="conf_p">\
                         <span class="f14 c6 mr20">二进制日志 </span><span class="f14 c6 mr20">' + toSize(rdata.msg) + '</span>\
                         '+line_status+'\
-                        <p class="f14 c6 mtb10" style="border-top:#ddd 1px solid; padding:10px 0">错误日志<button class="btn btn-default btn-clear btn-xs" style="float:right;" >清理日志</button></p>\
+                        <p class="f14 c6 mtb10" style="border-top:#ddd 1px solid; padding:10px 0">错误日志<button class="btn btn-default btn-clear btn-xs" style="float:right;">清理日志</button></p>\
                         <textarea readonly style="margin: 0px;width: 100%;height: 440px;background-color: #333;color:#fff; padding:0 5px" id="error_log"></textarea>\
                     </p>';
         $(".soft-man-con").html(limitCon);