|
@@ -9,6 +9,8 @@ import com.xxl.job.core.handler.IJobHandler;
|
|
|
import com.xxl.job.core.handler.impl.GlueJobHandler;
|
|
|
import com.xxl.job.core.log.XxlJobFileAppender;
|
|
|
import com.xxl.job.core.thread.JobThread;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
|
|
|
import java.util.Date;
|
|
|
|
|
@@ -16,6 +18,7 @@ import java.util.Date;
|
|
|
* Created by xuxueli on 17/3/1.
|
|
|
*/
|
|
|
public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
+ private static Logger logger = LoggerFactory.getLogger(ExecutorBizImpl.class);
|
|
|
|
|
|
@Override
|
|
|
public ReturnT<String> beat() {
|
|
@@ -55,25 +58,26 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
if (!triggerParam.isGlueSwitch()) {
|
|
|
// bean model
|
|
|
|
|
|
- // valid handler instance
|
|
|
+ // valid handler
|
|
|
IJobHandler jobHandler = XxlJobExecutor.loadJobHandler(triggerParam.getExecutorHandler());
|
|
|
if (jobHandler==null) {
|
|
|
return new ReturnT(ReturnT.FAIL_CODE, "job handler for JobId=[" + triggerParam.getJobId() + "] not found.");
|
|
|
}
|
|
|
|
|
|
+ // valid exists job thread:change handler, need kill old thread
|
|
|
+ if (jobThread != null && jobThread.getHandler() != jobHandler) {
|
|
|
+ // kill old job thread
|
|
|
+ jobThread.toStop("更换任务模式或JobHandler,终止旧任务线程");
|
|
|
+ jobThread.interrupt();
|
|
|
+ XxlJobExecutor.removeJobThread(triggerParam.getJobId());
|
|
|
+ jobThread = null;
|
|
|
+ }
|
|
|
+
|
|
|
+ // make thread: new or exists invalid
|
|
|
if (jobThread == null) {
|
|
|
jobThread = XxlJobExecutor.registJobThread(triggerParam.getJobId(), jobHandler);
|
|
|
- } else {
|
|
|
- // job handler update, kill old job thread
|
|
|
- if (jobThread.getHandler() != jobHandler) {
|
|
|
- // kill old job thread
|
|
|
- jobThread.toStop("更换任务模式或JobHandler,终止旧任务线程");
|
|
|
- jobThread.interrupt();
|
|
|
-
|
|
|
- // new thread, with new job handler
|
|
|
- jobThread = XxlJobExecutor.registJobThread(triggerParam.getJobId(), jobHandler);
|
|
|
- }
|
|
|
}
|
|
|
+
|
|
|
} else {
|
|
|
// glue model
|
|
|
|
|
@@ -82,19 +86,29 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
return new ReturnT(ReturnT.FAIL_CODE, "glueLoader for JobId=[" + triggerParam.getJobId() + "] not found.");
|
|
|
}
|
|
|
|
|
|
+ // valid exists job thread:change handler or glue timeout, need kill old thread
|
|
|
+ if (jobThread != null &&
|
|
|
+ !(jobThread.getHandler() instanceof GlueJobHandler
|
|
|
+ && ((GlueJobHandler) jobThread.getHandler()).getGlueUpdatetime()==triggerParam.getGlueUpdatetime() )) {
|
|
|
+ // change glue model or glue timeout, kill old job thread
|
|
|
+ jobThread.toStop("更换任务模式或JobHandler,终止旧任务线程");
|
|
|
+ jobThread.interrupt();
|
|
|
+ XxlJobExecutor.removeJobThread(triggerParam.getJobId());
|
|
|
+ jobThread = null;
|
|
|
+ }
|
|
|
+
|
|
|
+ // make thread: new or exists invalid
|
|
|
if (jobThread == null) {
|
|
|
- jobThread = XxlJobExecutor.registJobThread(triggerParam.getJobId(), new GlueJobHandler(triggerParam.getJobId()));
|
|
|
- } else {
|
|
|
- // job handler update, kill old job thread
|
|
|
- if (!(jobThread.getHandler() instanceof GlueJobHandler)) {
|
|
|
- // kill old job thread
|
|
|
- jobThread.toStop("更换任务模式或JobHandler,终止旧任务线程");
|
|
|
- jobThread.interrupt();
|
|
|
-
|
|
|
- // new thread, with new job handler
|
|
|
- jobThread = XxlJobExecutor.registJobThread(triggerParam.getJobId(), new GlueJobHandler(triggerParam.getJobId()));
|
|
|
+ IJobHandler jobHandler = null;
|
|
|
+ try {
|
|
|
+ jobHandler = GlueFactory.getInstance().loadNewInstance(triggerParam.getJobId());
|
|
|
+ } catch (Exception e) {
|
|
|
+ logger.error("", e);
|
|
|
+ return new ReturnT(ReturnT.FAIL_CODE, e.getMessage());
|
|
|
}
|
|
|
+ jobThread = XxlJobExecutor.registJobThread(triggerParam.getJobId(), new GlueJobHandler(jobHandler, triggerParam.getGlueUpdatetime()));
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
// push data to queue
|