diff --git a/class/core/site_api.py b/class/core/site_api.py index d5b770604..ef874b39c 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -789,6 +789,10 @@ class site_api: siteName = request.form.get('siteName', '') return self.getLogs(siteName) + def getErrorLogsApi(self): + siteName = request.form.get('siteName', '') + return self.getErrorLogs(siteName) + def getSitePhpVersionApi(self): siteName = request.form.get('siteName', '') return self.getSitePhpVersion(siteName) @@ -1737,6 +1741,12 @@ location ~* ^{from}(.*)$ { return mw.returnJson(False, '日志为空') return mw.returnJson(True, mw.getNumLines(logPath, 100)) + def getErrorLogs(self, siteName): + logPath = mw.getLogsDir() + '/' + siteName + '.error.log' + if not os.path.exists(logPath): + return mw.returnJson(False, '日志为空') + return mw.returnJson(True, mw.getNumLines(logPath, 100)) + # 取日志状态 def getLogsStatus(self, siteName): filename = self.getHostConf(siteName) diff --git a/route/static/app/site.js b/route/static/app/site.js index ff68dec97..325bf6f9e 100755 --- a/route/static/app/site.js +++ b/route/static/app/site.js @@ -1010,7 +1010,9 @@ function webEdit(id,website,endTime,addtime){ +"
重定向
" +"反向代理
" +"防盗链
" - +"响应日志
"; + +"响应日志
" + +"错误日志
"; + layer.open({ type: 1, area: '640px', @@ -1053,7 +1055,24 @@ function webEdit(id,website,endTime,addtime){ function getSiteLogs(siteName){ var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']}); $.post('/site/get_logs',{siteName:siteName},function(logs){ - console.log(logs); + // console.log(logs); + layer.close(loadT); + if(logs.status !== true){ + logs.msg = ''; + } + if (logs.msg == '') logs.msg = '当前没有日志.'; + var phpCon = ''; + $("#webedit-con").html(phpCon); + var ob = document.getElementById('error_log'); + ob.scrollTop = ob.scrollHeight; + },'json'); +} + +//取网站错误日志 +function getSiteErrorLogs(siteName){ + var loadT = layer.msg('正在处理,请稍候...',{icon:16,time:0,shade: [0.3, '#000']}); + $.post('/site/get_error_logs',{siteName:siteName},function(logs){ + // console.log(logs); layer.close(loadT); if(logs.status !== true){ logs.msg = '';