monitorThread.interrupt();放到try catch里面,方便去除这个功能不至于NPE

pull/12/head
xxssyyyyssxx 6 years ago
parent 408c2b112c
commit f03a109fb6

@ -105,8 +105,8 @@ public class JobFailMonitorHelper {
public void toStop(){ public void toStop(){
toStop = true; toStop = true;
// interrupt and wait // interrupt and wait
monitorThread.interrupt();
try { try {
monitorThread.interrupt();
monitorThread.join(); monitorThread.join();
} catch (InterruptedException e) { } catch (InterruptedException e) {
logger.error(e.getMessage(), e); logger.error(e.getMessage(), e);
@ -116,7 +116,6 @@ public class JobFailMonitorHelper {
// ---------------------- alarm ---------------------- // ---------------------- alarm ----------------------
// email alarm template
private static final String mailBodyTemplate = "<h5>" + I18nUtil.getString("jobconf_monitor_detail") + "</span>" + private static final String mailBodyTemplate = "<h5>" + I18nUtil.getString("jobconf_monitor_detail") + "</span>" +
"<table border=\"1\" cellpadding=\"3\" style=\"border-collapse:collapse; width:80%;\" >\n" + "<table border=\"1\" cellpadding=\"3\" style=\"border-collapse:collapse; width:80%;\" >\n" +
" <thead style=\"font-weight: bold;color: #ffffff;background-color: #ff8c00;\" >" + " <thead style=\"font-weight: bold;color: #ffffff;background-color: #ff8c00;\" >" +
@ -141,8 +140,6 @@ public class JobFailMonitorHelper {
/** /**
* fail alarm * fail alarm
*
* @param jobLog
*/ */
private boolean failAlarm(XxlJobInfo info, XxlJobLog jobLog){ private boolean failAlarm(XxlJobInfo info, XxlJobLog jobLog){
boolean alarmResult = true; boolean alarmResult = true;

Loading…
Cancel
Save