From f03a109fb6ac55713b23e4c159d17f1a4385e18a Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Fri, 11 Oct 2019 16:06:02 +0800
Subject: [PATCH] =?UTF-8?q?monitorThread.interrupt();=E6=94=BE=E5=88=B0try?=
 =?UTF-8?q?=20catch=E9=87=8C=E9=9D=A2=EF=BC=8C=E6=96=B9=E4=BE=BF=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E8=BF=99=E4=B8=AA=E5=8A=9F=E8=83=BD=E4=B8=8D=E8=87=B3?=
 =?UTF-8?q?=E4=BA=8ENPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xxl/job/admin/core/thread/JobFailMonitorHelper.java  | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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 = "<h5>" + I18nUtil.getString("jobconf_monitor_detail") + "：</span>" +
 			"<table border=\"1\" cellpadding=\"3\" style=\"border-collapse:collapse; width:80%;\" >\n" +
 			"   <thead style=\"font-weight: bold;color: #ffffff;background-color: #ff8c00;\" >" +
@@ -141,8 +140,6 @@ public class JobFailMonitorHelper {
 
 	/**
 	 * fail alarm
-	 *
-	 * @param jobLog
 	 */
 	private boolean failAlarm(XxlJobInfo info, XxlJobLog jobLog){
 		boolean alarmResult = true;