|
@@ -84,6 +84,12 @@ public class XxlJobExecutor {
|
|
|
initRpcProvider(ip, port, appName, accessToken);
|
|
|
}
|
|
|
public void destroy(){
|
|
|
+
|
|
|
+ List<JobThread> runningThreads = new ArrayList<>(jobThreadRepository.values());
|
|
|
+ if (logger.isInfoEnabled()) {
|
|
|
+ logger.info("running threads {}", runningThreads);
|
|
|
+ }
|
|
|
+
|
|
|
// destory executor-server
|
|
|
stopRpcProvider();
|
|
|
|
|
@@ -96,6 +102,15 @@ public class XxlJobExecutor {
|
|
|
}
|
|
|
jobHandlerRepository.clear();
|
|
|
|
|
|
+ for (JobThread runningThread : runningThreads) {
|
|
|
+ try {
|
|
|
+ // wait for all job thread push result to callback queue
|
|
|
+ runningThread.join();
|
|
|
+ } catch (InterruptedException e) {
|
|
|
+ logger.warn("interrupted while stopping {}", runningThread);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
// destory JobLogFileCleanThread
|
|
|
JobLogFileCleanThread.getInstance().toStop();
|