|
@@ -3,11 +3,11 @@ package com.xxl.job.core.thread;
|
|
import com.xxl.job.core.biz.model.HandleCallbackParam;
|
|
import com.xxl.job.core.biz.model.HandleCallbackParam;
|
|
import com.xxl.job.core.biz.model.ReturnT;
|
|
import com.xxl.job.core.biz.model.ReturnT;
|
|
import com.xxl.job.core.biz.model.TriggerParam;
|
|
import com.xxl.job.core.biz.model.TriggerParam;
|
|
|
|
+import com.xxl.job.core.context.XxlJobContext;
|
|
import com.xxl.job.core.executor.XxlJobExecutor;
|
|
import com.xxl.job.core.executor.XxlJobExecutor;
|
|
import com.xxl.job.core.handler.IJobHandler;
|
|
import com.xxl.job.core.handler.IJobHandler;
|
|
import com.xxl.job.core.log.XxlJobFileAppender;
|
|
import com.xxl.job.core.log.XxlJobFileAppender;
|
|
import com.xxl.job.core.log.XxlJobLogger;
|
|
import com.xxl.job.core.log.XxlJobLogger;
|
|
-import com.xxl.job.core.util.ShardingUtil;
|
|
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.Logger;
|
|
import org.slf4j.LoggerFactory;
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
|
@@ -117,8 +117,13 @@ public class JobThread extends Thread{
|
|
|
|
|
|
// log filename, like "logPath/yyyy-MM-dd/9999.log"
|
|
// log filename, like "logPath/yyyy-MM-dd/9999.log"
|
|
String logFileName = XxlJobFileAppender.makeLogFileName(new Date(triggerParam.getLogDateTime()), triggerParam.getLogId());
|
|
String logFileName = XxlJobFileAppender.makeLogFileName(new Date(triggerParam.getLogDateTime()), triggerParam.getLogId());
|
|
|
|
+ XxlJobContext.setXxlJobContext(new XxlJobContext(
|
|
|
|
+ triggerParam.getLogId(),
|
|
|
|
+ logFileName,
|
|
|
|
+ triggerParam.getBroadcastIndex(),
|
|
|
|
+ triggerParam.getBroadcastTotal()));
|
|
|
|
+
|
|
XxlJobFileAppender.contextHolder.set(logFileName);
|
|
XxlJobFileAppender.contextHolder.set(logFileName);
|
|
- ShardingUtil.setShardingVo(new ShardingUtil.ShardingVO(triggerParam.getBroadcastIndex(), triggerParam.getBroadcastTotal()));
|
|
|
|
|
|
|
|
// execute
|
|
// execute
|
|
XxlJobLogger.log("<br>----------- xxl-job job execute start -----------<br>----------- Param:" + triggerParam.getExecutorParams());
|
|
XxlJobLogger.log("<br>----------- xxl-job job execute start -----------<br>----------- Param:" + triggerParam.getExecutorParams());
|