Sfoglia il codice sorgente

底层Log调优,应用正常终止取消异常栈信息打印;

xuxueli 6 anni fa
parent
commit
a53e77b4c0

+ 7 - 2
xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java Vedi File

59
 
59
 
60
                         }
60
                         }
61
                     } catch (Exception e) {
61
                     } catch (Exception e) {
62
-                        logger.error(e.getMessage(), e);
62
+                        if (!toStop) {
63
+                            logger.error(e.getMessage(), e);
64
+                        }
65
+
63
                     }
66
                     }
64
 
67
 
65
                     try {
68
                     try {
66
                         TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT);
69
                         TimeUnit.SECONDS.sleep(RegistryConfig.BEAT_TIMEOUT);
67
                     } catch (InterruptedException e) {
70
                     } catch (InterruptedException e) {
68
-                        logger.warn(">>>>>>>>>>> xxl-job, executor registry thread interrupted, error msg:{}", e.getMessage());
71
+                        if (!toStop) {
72
+                            logger.warn(">>>>>>>>>>> xxl-job, executor registry thread interrupted, error msg:{}", e.getMessage());
73
+                        }
69
                     }
74
                     }
70
                 }
75
                 }
71
 
76
 

+ 7 - 2
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java Vedi File

82
                         }
82
                         }
83
 
83
 
84
                     } catch (Exception e) {
84
                     } catch (Exception e) {
85
-                        logger.error(e.getMessage(), e);
85
+                        if (!toStop) {
86
+                            logger.error(e.getMessage(), e);
87
+                        }
88
+
86
                     }
89
                     }
87
 
90
 
88
                     try {
91
                     try {
89
                         TimeUnit.DAYS.sleep(1);
92
                         TimeUnit.DAYS.sleep(1);
90
                     } catch (InterruptedException e) {
93
                     } catch (InterruptedException e) {
91
-                        logger.error(e.getMessage(), e);
94
+                        if (!toStop) {
95
+                            logger.error(e.getMessage(), e);
96
+                        }
92
                     }
97
                     }
93
                 }
98
                 }
94
                 logger.info(">>>>>>>>>>> xxl-job, executor JobLogFileCleanThread thread destory.");
99
                 logger.info(">>>>>>>>>>> xxl-job, executor JobLogFileCleanThread thread destory.");

+ 6 - 2
xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java Vedi File

76
                             }
76
                             }
77
                         }
77
                         }
78
                     } catch (Exception e) {
78
                     } catch (Exception e) {
79
-                        logger.error(e.getMessage(), e);
79
+                        if (!toStop) {
80
+                            logger.error(e.getMessage(), e);
81
+                        }
80
                     }
82
                     }
81
                 }
83
                 }
82
 
84
 
88
                         doCallback(callbackParamList);
90
                         doCallback(callbackParamList);
89
                     }
91
                     }
90
                 } catch (Exception e) {
92
                 } catch (Exception e) {
91
-                    logger.error(e.getMessage(), e);
93
+                    if (!toStop) {
94
+                        logger.error(e.getMessage(), e);
95
+                    }
92
                 }
96
                 }
93
                 logger.info(">>>>>>>>>>> xxl-job, executor callback thread destory.");
97
                 logger.info(">>>>>>>>>>> xxl-job, executor callback thread destory.");
94
 
98