From ec06ae09ae93f4475698cbbc926451f37b33df57 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Wed, 9 Jan 2019 15:10:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E5=B1=82Log=E8=B0=83=E4=BC=98?=
 =?UTF-8?q?=EF=BC=8C=E5=BA=94=E7=94=A8=E6=AD=A3=E5=B8=B8=E7=BB=88=E6=AD=A2?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E5=BC=82=E5=B8=B8=E6=A0=88=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=89=93=E5=8D=B0=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xxl/job/admin/core/thread/JobFailMonitorHelper.java  | 2 +-
 .../job/admin/core/thread/JobRegistryMonitorHelper.java  | 2 +-
 .../com/xxl/job/core/thread/TriggerCallbackThread.java   | 9 +++++++--
 3 files changed, 9 insertions(+), 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 de96c2be..0ef82b3e 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
@@ -93,7 +93,7 @@ public class JobFailMonitorHelper {
 					}
 				}
 
-				logger.warn(">>>>>>>>>>> xxl-job, job fail monitor thread stop");
+				logger.info(">>>>>>>>>>> xxl-job, job fail monitor thread stop");
 
 			}
 		});
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java
index 0742b972..9cf051d4 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobRegistryMonitorHelper.java
@@ -86,7 +86,7 @@ public class JobRegistryMonitorHelper {
 						}
 					}
 				}
-				logger.warn(">>>>>>>>>>> xxl-job, job registry monitor thread stop");
+				logger.info(">>>>>>>>>>> xxl-job, job registry monitor thread stop");
 			}
 		});
 		registryThread.setDaemon(true);
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
index 3ff6f9b7..9fba156d 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
@@ -110,12 +110,17 @@ public class TriggerCallbackThread {
                     try {
                         retryFailCallbackFile();
                     } catch (Exception e) {
-                        logger.error(e.getMessage(), e);
+                        if (!toStop) {
+                            logger.error(e.getMessage(), e);
+                        }
+
                     }
                     try {
                         TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT);
                     } catch (InterruptedException e) {
-                        logger.warn(">>>>>>>>>>> xxl-job, executor retry callback thread interrupted, error msg:{}", e.getMessage());
+                        if (!toStop) {
+                            logger.error(e.getMessage(), e);
+                        }
                     }
                 }
                 logger.info(">>>>>>>>>>> xxl-job, executor retry callback thread destory.");
-- 
GitLab