diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java index f5462d82..19f6042c 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java @@ -105,8 +105,8 @@ public class JobFailMonitorHelper { public void toStop(){ toStop = true; // interrupt and wait - monitorThread.interrupt(); try { + monitorThread.interrupt(); monitorThread.join(); } catch (InterruptedException e) { logger.error(e.getMessage(), e); @@ -116,7 +116,6 @@ public class JobFailMonitorHelper { // ---------------------- alarm ---------------------- - // email alarm template private static final String mailBodyTemplate = "
" + I18nUtil.getString("jobconf_monitor_detail") + ":" + "\n" + " " + @@ -141,8 +140,6 @@ public class JobFailMonitorHelper { /** * fail alarm - * - * @param jobLog */ private boolean failAlarm(XxlJobInfo info, XxlJobLog jobLog){ boolean alarmResult = true;