diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java index 22b153b0..11b31029 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/controller/biz/JobLogController.java @@ -328,7 +328,7 @@ public class JobLogController { return logResult; } catch (Exception e) { - logger.error(e.getMessage(), e); + logger.error("logId({}) logDetailCat error: {}", logId, e.getMessage(), e); return Response.ofFail(e.getMessage()); } } diff --git a/xxl-job-admin/src/main/resources/templates/biz/log.detail.ftl b/xxl-job-admin/src/main/resources/templates/biz/log.detail.ftl index 92e2e416..97ae089d 100644 --- a/xxl-job-admin/src/main/resources/templates/biz/log.detail.ftl +++ b/xxl-job-admin/src/main/resources/templates/biz/log.detail.ftl @@ -94,10 +94,10 @@ var handleCode = '${handleCode}'; var logId = '${logId}'; - // valid trigger fail, end - if ( !(triggerCode == 200 || handleCode != 0) ) { + // trigger fail and not handle + if (triggerCode != 200 && handleCode == 0) { $('#logConsoleRunning').hide(); - $('#logConsole').append(''+ I18n.joblog_rolling_log_triggerfail +''); + $('#logConsole').append('['+ I18n.joblog_rolling_log_triggerfail +']'); return; } @@ -107,15 +107,14 @@ var fromLineNum = 1; // [from, to], start as 1 var pullFailCount = 0; function pullLog() { - // pullFailCount, max=20 + // limit max pull-fail count, max=20 if (pullFailCount++ > 20) { - logRunStop(''+ I18n.joblog_rolling_log_failoften +''); + logRunStop('['+ I18n.joblog_rolling_log_failoften +']'); return; } // load console.log("pullLog, fromLineNum:" + fromLineNum); - $.ajax({ type : 'POST', async: false, // sync, make log ordered @@ -128,6 +127,7 @@ success : function(data){ if (data.code == 200) { + // pull fail if (!data.data) { console.log('pullLog fail'); return; @@ -136,15 +136,15 @@ console.log('pullLog fromLineNum not match'); return; } + // pull to end if (fromLineNum > data.data.toLineNum ) { console.log('pullLog already line-end'); // valid end if (data.data.end) { - logRunStop('
[Rolling Log Finish]'); + logRunStop('
[Rolling Log End]'); return; } - return; } @@ -157,7 +157,9 @@ scrollTo(0, document.body.scrollHeight); // $('#logConsolePre').scrollTop( document.body.scrollHeight + 300 ); } else { + // pull fail console.log('pullLog fail:'+data.msg); + $('#logConsole').append('[Rolling Log Error]: '+ data.msg +''); } } }); @@ -168,7 +170,7 @@ // if handle already callback, stop cycle pull if (handleCode > 0) { - logRunStop('
[Load Log Finish]'); + logRunStop('
[Rolling Log Finish]'); return; }