Browse Source

Merge pull request #607 from jiangeeq/master

许雪里 6 years ago
parent
commit
d0e8674fb6
No account linked to committer's email

+ 13 - 0
xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java View File

@@ -92,6 +92,12 @@ public class XxlJobExecutor  {
92 92
             }
93 93
             jobThreadRepository.clear();
94 94
         }
95
+        if(jobHandlerRepository.size() >0 ){
96
+            for (Map.Entry<String, IJobHandler> item: jobHandlerRepository.entrySet()){
97
+                removeJobHandler(item.getKey(), "web container destroy and kill the jod handler");
98
+            }
99
+            jobHandlerRepository.clear();
100
+        }
95 101
 
96 102
 
97 103
         // destory JobLogFileCleanThread
@@ -104,6 +110,13 @@ public class XxlJobExecutor  {
104 110
         stopRpcProvider();
105 111
     }
106 112
 
113
+    private void removeJobHandler(String handlerId, String removeOldReason){
114
+        IJobHandler oldJobHandler = jobHandlerRepository.remove(handlerId);
115
+        if (oldJobHandler != null) {
116
+            oldJobHandler.destroy();
117
+        }
118
+    }
119
+
107 120
 
108 121
     // ---------------------- admin-client (rpc invoker) ----------------------
109 122
     private static List<AdminBiz> adminBizList;