diff --git a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java
index c33c6364..6fb89e7f 100644
--- a/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java
+++ b/xxl-job-admin/src/test/java/com/xxl/job/adminbiz/AdminBizTest.java
@@ -32,7 +32,7 @@ public class AdminBizTest {
HandleCallbackParam param = new HandleCallbackParam();
param.setLogId(1);
- param.setHandleCode(XxlJobContext.HANDLE_COCE_SUCCESS);
+ param.setHandleCode(XxlJobContext.HANDLE_CODE_SUCCESS);
List
callbackParamList = Arrays.asList(param);
diff --git a/xxl-job-core/pom.xml b/xxl-job-core/pom.xml
index 70769714..48f3d50d 100644
--- a/xxl-job-core/pom.xml
+++ b/xxl-job-core/pom.xml
@@ -4,7 +4,7 @@
com.xuxueli
xxl-job
- 2.3.0
+ 2.3.1-SNAPSHOT
xxl-job-core
jar
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java
index 4f56368a..51d4bd5b 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java
@@ -12,6 +12,7 @@ public class TriggerParam implements Serializable{
private String executorHandler;
private String executorParams;
+ private String shardingParam;
private String executorBlockStrategy;
private int executorTimeout;
@@ -46,6 +47,14 @@ public class TriggerParam implements Serializable{
return executorParams;
}
+ public String getShardingParam() {
+ return shardingParam;
+ }
+
+ public void setShardingParam(String shardingParam) {
+ this.shardingParam = shardingParam;
+ }
+
public void setExecutorParams(String executorParams) {
this.executorParams = executorParams;
}
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java b/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java
index 0657cf76..117e9612 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobContext.java
@@ -8,9 +8,9 @@ package com.xxl.job.core.context;
*/
public class XxlJobContext {
- public static final int HANDLE_COCE_SUCCESS = 200;
- public static final int HANDLE_COCE_FAIL = 500;
- public static final int HANDLE_COCE_TIMEOUT = 502;
+ public static final int HANDLE_CODE_SUCCESS = 200;
+ public static final int HANDLE_CODE_FAIL = 500;
+ public static final int HANDLE_CODE_TIMEOUT = 502;
// ---------------------- base info ----------------------
@@ -23,6 +23,10 @@ public class XxlJobContext {
* job param
*/
private final String jobParam;
+ /**
+ * job param
+ */
+ private final String jobShardingParam;
// ---------------------- for log ----------------------
@@ -64,11 +68,22 @@ public class XxlJobContext {
public XxlJobContext(long jobId, String jobParam, String jobLogFileName, int shardIndex, int shardTotal) {
this.jobId = jobId;
this.jobParam = jobParam;
+ this.jobShardingParam = null;
this.jobLogFileName = jobLogFileName;
this.shardIndex = shardIndex;
this.shardTotal = shardTotal;
- this.handleCode = HANDLE_COCE_SUCCESS; // default success
+ this.handleCode = HANDLE_CODE_SUCCESS; // default success
+ }
+
+ public XxlJobContext(long jobId, String jobParam, String jobShardingParam, String jobLogFileName, int shardIndex, int shardTotal) {
+ this.jobId = jobId;
+ this.jobParam = jobParam;
+ this.jobShardingParam = jobShardingParam;
+ this.jobLogFileName = jobLogFileName;
+ this.shardIndex = shardIndex;
+ this.shardTotal = shardTotal;
+ this.handleCode = HANDLE_CODE_SUCCESS; // default success
}
public long getJobId() {
@@ -79,6 +94,10 @@ public class XxlJobContext {
return jobParam;
}
+ public String getJobShardingParam() {
+ return jobShardingParam;
+ }
+
public String getJobLogFileName() {
return jobLogFileName;
}
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java b/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java
index cec7f587..e14ad16d 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/context/XxlJobHelper.java
@@ -48,6 +48,20 @@ public class XxlJobHelper {
return xxlJobContext.getJobParam();
}
+ /**
+ * current JobParam
+ *
+ * @return
+ */
+ public static String getJobShardingParam() {
+ XxlJobContext xxlJobContext = XxlJobContext.getXxlJobContext();
+ if (xxlJobContext == null) {
+ return null;
+ }
+
+ return xxlJobContext.getJobShardingParam();
+ }
+
// ---------------------- for log ----------------------
/**
@@ -177,7 +191,7 @@ public class XxlJobHelper {
* @return
*/
public static boolean handleSuccess(){
- return handleResult(XxlJobContext.HANDLE_COCE_SUCCESS, null);
+ return handleResult(XxlJobContext.HANDLE_CODE_SUCCESS, null);
}
/**
@@ -187,7 +201,7 @@ public class XxlJobHelper {
* @return
*/
public static boolean handleSuccess(String handleMsg) {
- return handleResult(XxlJobContext.HANDLE_COCE_SUCCESS, handleMsg);
+ return handleResult(XxlJobContext.HANDLE_CODE_SUCCESS, handleMsg);
}
/**
@@ -196,7 +210,7 @@ public class XxlJobHelper {
* @return
*/
public static boolean handleFail(){
- return handleResult(XxlJobContext.HANDLE_COCE_FAIL, null);
+ return handleResult(XxlJobContext.HANDLE_CODE_FAIL, null);
}
/**
@@ -206,7 +220,7 @@ public class XxlJobHelper {
* @return
*/
public static boolean handleFail(String handleMsg) {
- return handleResult(XxlJobContext.HANDLE_COCE_FAIL, handleMsg);
+ return handleResult(XxlJobContext.HANDLE_CODE_FAIL, handleMsg);
}
/**
@@ -215,7 +229,7 @@ public class XxlJobHelper {
* @return
*/
public static boolean handleTimeout(){
- return handleResult(XxlJobContext.HANDLE_COCE_TIMEOUT, null);
+ return handleResult(XxlJobContext.HANDLE_CODE_TIMEOUT, null);
}
/**
@@ -225,7 +239,7 @@ public class XxlJobHelper {
* @return
*/
public static boolean handleTimeout(String handleMsg){
- return handleResult(XxlJobContext.HANDLE_COCE_TIMEOUT, handleMsg);
+ return handleResult(XxlJobContext.HANDLE_CODE_TIMEOUT, handleMsg);
}
/**
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java b/xxl-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java
index a9dc1bea..ca134c2c 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/enums/ExecutorBlockStrategyEnum.java
@@ -6,7 +6,7 @@ package com.xxl.job.core.enums;
public enum ExecutorBlockStrategyEnum {
SERIAL_EXECUTION("Serial execution"),
- /*CONCURRENT_EXECUTION("并行"),*/
+ CONCURRENT_EXECUTION("Concurrent execution"),
DISCARD_LATER("Discard Later"),
COVER_EARLY("Cover Early");
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
index 945fded4..70a2dad9 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
@@ -3,6 +3,8 @@ package com.xxl.job.core.executor;
import com.xxl.job.core.biz.AdminBiz;
import com.xxl.job.core.biz.client.AdminBizClient;
import com.xxl.job.core.handler.IJobHandler;
+import com.xxl.job.core.handler.annotation.XxlJob;
+import com.xxl.job.core.handler.impl.MethodJobHandler;
import com.xxl.job.core.log.XxlJobFileAppender;
import com.xxl.job.core.server.EmbedServer;
import com.xxl.job.core.thread.JobLogFileCleanThread;
@@ -13,6 +15,7 @@ import com.xxl.job.core.util.NetUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -81,10 +84,10 @@ public class XxlJobExecutor {
initEmbedServer(address, ip, port, appname, accessToken);
}
public void destroy(){
- // destory executor-server
+ // destroy executor-server
stopEmbedServer();
- // destory jobThreadRepository
+ // destroy jobThreadRepository
if (jobThreadRepository.size() > 0) {
for (Map.Entry item: jobThreadRepository.entrySet()) {
JobThread oldJobThread = removeJobThread(item.getKey(), "web container destroy and kill the job.");
@@ -102,10 +105,10 @@ public class XxlJobExecutor {
jobHandlerRepository.clear();
- // destory JobLogFileCleanThread
+ // destroy JobLogFileCleanThread
JobLogFileCleanThread.getInstance().toStop();
- // destory TriggerCallbackThread
+ // destroy TriggerCallbackThread
TriggerCallbackThread.getInstance().toStop();
}
@@ -178,6 +181,59 @@ public class XxlJobExecutor {
logger.info(">>>>>>>>>>> xxl-job register jobhandler success, name:{}, jobHandler:{}", name, jobHandler);
return jobHandlerRepository.put(name, jobHandler);
}
+ protected void registJobHandler(XxlJob xxlJob, Object bean, Method executeMethod){
+ if (xxlJob == null) {
+ return;
+ }
+
+ String name = xxlJob.value();
+ //make and simplify the variables since they'll be called several times later
+ Class clazz = bean.getClass();
+ String methodName = executeMethod.getName();
+ if (name.trim().length() == 0) {
+ throw new RuntimeException("xxl-job method-jobhandler name invalid, for[" + clazz + "#" + methodName + "] .");
+ }
+ if (loadJobHandler(name) != null) {
+ throw new RuntimeException("xxl-job jobhandler[" + name + "] naming conflicts.");
+ }
+
+ // execute method
+ /*if (!(method.getParameterTypes().length == 1 && method.getParameterTypes()[0].isAssignableFrom(String.class))) {
+ throw new RuntimeException("xxl-job method-jobhandler param-classtype invalid, for[" + bean.getClass() + "#" + method.getName() + "] , " +
+ "The correct method format like \" public ReturnT execute(String param) \" .");
+ }
+ if (!method.getReturnType().isAssignableFrom(ReturnT.class)) {
+ throw new RuntimeException("xxl-job method-jobhandler return-classtype invalid, for[" + bean.getClass() + "#" + method.getName() + "] , " +
+ "The correct method format like \" public ReturnT execute(String param) \" .");
+ }*/
+
+ executeMethod.setAccessible(true);
+
+ // init and destroy
+ Method initMethod = null;
+ Method destroyMethod = null;
+
+ if (xxlJob.init().trim().length() > 0) {
+ try {
+ initMethod = clazz.getDeclaredMethod(xxlJob.init());
+ initMethod.setAccessible(true);
+ } catch (NoSuchMethodException e) {
+ throw new RuntimeException("xxl-job method-jobhandler initMethod invalid, for[" + clazz + "#" + methodName + "] .");
+ }
+ }
+ if (xxlJob.destroy().trim().length() > 0) {
+ try {
+ destroyMethod = clazz.getDeclaredMethod(xxlJob.destroy());
+ destroyMethod.setAccessible(true);
+ } catch (NoSuchMethodException e) {
+ throw new RuntimeException("xxl-job method-jobhandler destroyMethod invalid, for[" + clazz + "#" + methodName + "] .");
+ }
+ }
+
+ // registry jobhandler
+ registJobHandler(name, new MethodJobHandler(bean, executeMethod, initMethod, destroyMethod));
+
+ }
// ---------------------- job thread repository ----------------------
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSimpleExecutor.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSimpleExecutor.java
index d1b413a3..53efbb95 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSimpleExecutor.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSimpleExecutor.java
@@ -30,6 +30,7 @@ public class XxlJobSimpleExecutor extends XxlJobExecutor {
}
+ @Override
public void start() {
// init JobHandler Repository (for method)
@@ -43,6 +44,7 @@ public class XxlJobSimpleExecutor extends XxlJobExecutor {
}
}
+ @Override
public void destroy() {
super.destroy();
}
@@ -57,62 +59,13 @@ public class XxlJobSimpleExecutor extends XxlJobExecutor {
for (Object bean: xxlJobBeanList) {
// method
Method[] methods = bean.getClass().getDeclaredMethods();
- if (methods==null || methods.length==0) {
+ if (methods.length == 0) {
continue;
}
for (Method executeMethod : methods) {
-
- // anno
XxlJob xxlJob = executeMethod.getAnnotation(XxlJob.class);
- if (xxlJob == null) {
- continue;
- }
-
- String name = xxlJob.value();
- if (name.trim().length() == 0) {
- throw new RuntimeException("xxl-job method-jobhandler name invalid, for[" + bean.getClass() + "#" + executeMethod.getName() + "] .");
- }
- if (loadJobHandler(name) != null) {
- throw new RuntimeException("xxl-job jobhandler[" + name + "] naming conflicts.");
- }
-
- // execute method
- /*if (!(method.getParameterTypes().length == 1 && method.getParameterTypes()[0].isAssignableFrom(String.class))) {
- throw new RuntimeException("xxl-job method-jobhandler param-classtype invalid, for[" + bean.getClass() + "#" + method.getName() + "] , " +
- "The correct method format like \" public ReturnT execute(String param) \" .");
- }
- if (!method.getReturnType().isAssignableFrom(ReturnT.class)) {
- throw new RuntimeException("xxl-job method-jobhandler return-classtype invalid, for[" + bean.getClass() + "#" + method.getName() + "] , " +
- "The correct method format like \" public ReturnT execute(String param) \" .");
- }*/
-
- executeMethod.setAccessible(true);
-
- // init and destory
- Method initMethod = null;
- Method destroyMethod = null;
-
- if (xxlJob.init().trim().length() > 0) {
- try {
- initMethod = bean.getClass().getDeclaredMethod(xxlJob.init());
- initMethod.setAccessible(true);
- } catch (NoSuchMethodException e) {
- throw new RuntimeException("xxl-job method-jobhandler initMethod invalid, for[" + bean.getClass() + "#" + executeMethod.getName() + "] .");
- }
- }
- if (xxlJob.destroy().trim().length() > 0) {
- try {
- destroyMethod = bean.getClass().getDeclaredMethod(xxlJob.destroy());
- destroyMethod.setAccessible(true);
- } catch (NoSuchMethodException e) {
- throw new RuntimeException("xxl-job method-jobhandler destroyMethod invalid, for[" + bean.getClass() + "#" + executeMethod.getName() + "] .");
- }
- }
-
- // registry jobhandler
- registJobHandler(name, new MethodJobHandler(bean, executeMethod, initMethod, destroyMethod));
-
-
+ // registry
+ registJobHandler(xxlJob, bean, executeMethod);
}
}
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java
index 0e689f41..3c2a67d5 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/impl/XxlJobSpringExecutor.java
@@ -105,56 +105,10 @@ public class XxlJobSpringExecutor extends XxlJobExecutor implements ApplicationC
for (Map.Entry methodXxlJobEntry : annotatedMethods.entrySet()) {
Method executeMethod = methodXxlJobEntry.getKey();
XxlJob xxlJob = methodXxlJobEntry.getValue();
- if (xxlJob == null) {
- continue;
- }
-
- String name = xxlJob.value();
- if (name.trim().length() == 0) {
- throw new RuntimeException("xxl-job method-jobhandler name invalid, for[" + bean.getClass() + "#" + executeMethod.getName() + "] .");
- }
- if (loadJobHandler(name) != null) {
- throw new RuntimeException("xxl-job jobhandler[" + name + "] naming conflicts.");
- }
-
- // execute method
- /*if (!(method.getParameterTypes().length == 1 && method.getParameterTypes()[0].isAssignableFrom(String.class))) {
- throw new RuntimeException("xxl-job method-jobhandler param-classtype invalid, for[" + bean.getClass() + "#" + method.getName() + "] , " +
- "The correct method format like \" public ReturnT execute(String param) \" .");
- }
- if (!method.getReturnType().isAssignableFrom(ReturnT.class)) {
- throw new RuntimeException("xxl-job method-jobhandler return-classtype invalid, for[" + bean.getClass() + "#" + method.getName() + "] , " +
- "The correct method format like \" public ReturnT execute(String param) \" .");
- }*/
-
- executeMethod.setAccessible(true);
-
- // init and destory
- Method initMethod = null;
- Method destroyMethod = null;
-
- if (xxlJob.init().trim().length() > 0) {
- try {
- initMethod = bean.getClass().getDeclaredMethod(xxlJob.init());
- initMethod.setAccessible(true);
- } catch (NoSuchMethodException e) {
- throw new RuntimeException("xxl-job method-jobhandler initMethod invalid, for[" + bean.getClass() + "#" + executeMethod.getName() + "] .");
- }
- }
- if (xxlJob.destroy().trim().length() > 0) {
- try {
- destroyMethod = bean.getClass().getDeclaredMethod(xxlJob.destroy());
- destroyMethod.setAccessible(true);
- } catch (NoSuchMethodException e) {
- throw new RuntimeException("xxl-job method-jobhandler destroyMethod invalid, for[" + bean.getClass() + "#" + executeMethod.getName() + "] .");
- }
- }
-
- // registry jobhandler
- registJobHandler(name, new MethodJobHandler(bean, executeMethod, initMethod, destroyMethod));
+ // regist
+ registJobHandler(xxlJob, bean, executeMethod);
}
}
-
}
// ---------------------- applicationContext ----------------------
@@ -162,7 +116,7 @@ public class XxlJobSpringExecutor extends XxlJobExecutor implements ApplicationC
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
- this.applicationContext = applicationContext;
+ XxlJobSpringExecutor.applicationContext = applicationContext;
}
public static ApplicationContext getApplicationContext() {
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java b/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java
index a3fc9af9..242d6b63 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/server/EmbedServer.java
@@ -52,7 +52,7 @@ public class EmbedServer {
new ThreadFactory() {
@Override
public Thread newThread(Runnable r) {
- return new Thread(r, "xxl-rpc, EmbedServer bizThreadPool-" + r.hashCode());
+ return new Thread(r, "xxl-job, EmbedServer bizThreadPool-" + r.hashCode());
}
},
new RejectedExecutionHandler() {
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
index ff657b21..e43a2a49 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/ExecutorRegistryThread.java
@@ -102,7 +102,7 @@ public class ExecutorRegistryThread {
logger.error(e.getMessage(), e);
}
}
- logger.info(">>>>>>>>>>> xxl-job, executor registry thread destory.");
+ logger.info(">>>>>>>>>>> xxl-job, executor registry thread destroy.");
}
});
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java
index 8b983715..b5691542 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobLogFileCleanThread.java
@@ -96,7 +96,7 @@ public class JobLogFileCleanThread {
}
}
}
- logger.info(">>>>>>>>>>> xxl-job, executor JobLogFileCleanThread thread destory.");
+ logger.info(">>>>>>>>>>> xxl-job, executor JobLogFileCleanThread thread destroy.");
}
});
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
index 0ea04f0c..29d8772d 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
@@ -5,6 +5,7 @@ import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.biz.model.TriggerParam;
import com.xxl.job.core.context.XxlJobContext;
import com.xxl.job.core.context.XxlJobHelper;
+import com.xxl.job.core.enums.ExecutorBlockStrategyEnum;
import com.xxl.job.core.executor.XxlJobExecutor;
import com.xxl.job.core.handler.IJobHandler;
import com.xxl.job.core.log.XxlJobFileAppender;
@@ -44,6 +45,9 @@ public class JobThread extends Thread{
this.handler = handler;
this.triggerQueue = new LinkedBlockingQueue();
this.triggerLogIdSet = Collections.synchronizedSet(new HashSet());
+
+ // assign job thread name
+ this.setName("xxl-job, JobThread-"+jobId+"-"+System.currentTimeMillis());
}
public IJobHandler getHandler() {
return handler;
@@ -100,6 +104,7 @@ public class JobThread extends Thread{
logger.error(e.getMessage(), e);
}
+ ExecutorService executor2 = Executors.newFixedThreadPool(5);
// execute
while(!toStop){
running = false;
@@ -109,7 +114,7 @@ public class JobThread extends Thread{
try {
// to check toStop signal, we need cycle, so wo cannot use queue.take(), instand of poll(timeout)
triggerParam = triggerQueue.poll(3L, TimeUnit.SECONDS);
- if (triggerParam!=null) {
+ if (triggerParam!=null) {
running = true;
idleTimes = 0;
triggerLogIdSet.remove(triggerParam.getLogId());
@@ -119,6 +124,7 @@ public class JobThread extends Thread{
XxlJobContext xxlJobContext = new XxlJobContext(
triggerParam.getJobId(),
triggerParam.getExecutorParams(),
+ triggerParam.getShardingParam(),
logFileName,
triggerParam.getBroadcastIndex(),
triggerParam.getBroadcastTotal());
@@ -127,7 +133,7 @@ public class JobThread extends Thread{
XxlJobContext.setXxlJobContext(xxlJobContext);
// execute
- XxlJobHelper.log("
----------- xxl-job job execute start -----------
----------- Param:" + xxlJobContext.getJobParam());
+ XxlJobHelper.log("
----------- xxl-job job execute start -----------
----------- Param:" + xxlJobContext.getJobParam()+ "Sharding Param:" + xxlJobContext.getJobShardingParam());
if (triggerParam.getExecutorTimeout() > 0) {
// limit timeout
@@ -158,6 +164,19 @@ public class JobThread extends Thread{
} finally {
futureThread.interrupt();
}
+ } else if (triggerParam.getExecutorBlockStrategy().equals(ExecutorBlockStrategyEnum.CONCURRENT_EXECUTION.name())){
+ executor2.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ // init job context
+ XxlJobContext.setXxlJobContext(xxlJobContext);
+ handler.execute();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ });
} else {
// just execute
handler.execute();
@@ -215,13 +234,14 @@ public class JobThread extends Thread{
TriggerCallbackThread.pushCallBack(new HandleCallbackParam(
triggerParam.getLogId(),
triggerParam.getLogDateTime(),
- XxlJobContext.HANDLE_COCE_FAIL,
+ XxlJobContext.HANDLE_CODE_FAIL,
stopReason + " [job running, killed]" )
);
}
}
}
}
+ executor2.shutdown();
// callback trigger request in queue
while(triggerQueue !=null && triggerQueue.size()>0){
@@ -231,7 +251,7 @@ public class JobThread extends Thread{
TriggerCallbackThread.pushCallBack(new HandleCallbackParam(
triggerParam.getLogId(),
triggerParam.getLogDateTime(),
- XxlJobContext.HANDLE_COCE_FAIL,
+ XxlJobContext.HANDLE_CODE_FAIL,
stopReason + " [job not executed, in the job queue, killed.]")
);
}
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
index 93eda40b..a7c5b55c 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/TriggerCallbackThread.java
@@ -95,7 +95,7 @@ public class TriggerCallbackThread {
logger.error(e.getMessage(), e);
}
}
- logger.info(">>>>>>>>>>> xxl-job, executor callback thread destory.");
+ logger.info(">>>>>>>>>>> xxl-job, executor callback thread destroy.");
}
});
@@ -125,7 +125,7 @@ public class TriggerCallbackThread {
}
}
}
- logger.info(">>>>>>>>>>> xxl-job, executor retry callback thread destory.");
+ logger.info(">>>>>>>>>>> xxl-job, executor retry callback thread destroy.");
}
});
triggerRetryCallbackThread.setDaemon(true);
@@ -191,6 +191,7 @@ public class TriggerCallbackThread {
XxlJobContext.setXxlJobContext(new XxlJobContext(
-1,
null,
+ null,
logFileName,
-1,
-1));
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java
index 31270df1..41d285f1 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/NetUtil.java
@@ -53,7 +53,7 @@ public class NetUtil {
serverSocket = new ServerSocket(port);
used = false;
} catch (IOException e) {
- logger.info(">>>>>>>>>>> xxl-rpc, port[{}] is in use.", port);
+ logger.info(">>>>>>>>>>> xxl-job, port[{}] is in use.", port);
used = true;
} finally {
if (serverSocket != null) {
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java b/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java
index 8d781c31..d22a73e7 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/util/XxlJobRemotingUtil.java
@@ -34,17 +34,21 @@ public class XxlJobRemotingUtil {
logger.error(e.getMessage(), e);
}
connection.setHostnameVerifier(new HostnameVerifier() {
+ @Override
public boolean verify(String hostname, SSLSession session) {
return true;
}
});
}
private static final TrustManager[] trustAllCerts = new TrustManager[]{new X509TrustManager() {
+ @Override
public java.security.cert.X509Certificate[] getAcceptedIssuers() {
return new java.security.cert.X509Certificate[]{};
}
+ @Override
public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
}
+ @Override
public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {
}
}};
@@ -114,7 +118,7 @@ public class XxlJobRemotingUtil {
// valid StatusCode
int statusCode = connection.getResponseCode();
if (statusCode != 200) {
- return new ReturnT(ReturnT.FAIL_CODE, "xxl-rpc remoting fail, StatusCode("+ statusCode +") invalid. for url : " + url);
+ return new ReturnT(ReturnT.FAIL_CODE, "xxl-job remoting fail, StatusCode("+ statusCode +") invalid. for url : " + url);
}
// result
@@ -131,13 +135,13 @@ public class XxlJobRemotingUtil {
ReturnT returnT = GsonTool.fromJson(resultJson, ReturnT.class, returnTargClassOfT);
return returnT;
} catch (Exception e) {
- logger.error("xxl-rpc remoting (url="+url+") response content invalid("+ resultJson +").", e);
- return new ReturnT(ReturnT.FAIL_CODE, "xxl-rpc remoting (url="+url+") response content invalid("+ resultJson +").");
+ logger.error("xxl-job remoting (url="+url+") response content invalid("+ resultJson +").", e);
+ return new ReturnT(ReturnT.FAIL_CODE, "xxl-job remoting (url="+url+") response content invalid("+ resultJson +").");
}
} catch (Exception e) {
logger.error(e.getMessage(), e);
- return new ReturnT(ReturnT.FAIL_CODE, "xxl-rpc remoting error("+ e.getMessage() +"), for url : " + url);
+ return new ReturnT(ReturnT.FAIL_CODE, "xxl-job remoting error("+ e.getMessage() +"), for url : " + url);
} finally {
try {
if (bufferedReader != null) {
diff --git a/xxl-job-executor-samples/pom.xml b/xxl-job-executor-samples/pom.xml
index ef1fba22..712daf11 100644
--- a/xxl-job-executor-samples/pom.xml
+++ b/xxl-job-executor-samples/pom.xml
@@ -5,7 +5,7 @@
com.xuxueli
xxl-job
- 2.3.0
+ 2.3.1-SNAPSHOT
xxl-job-executor-samples
pom
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml
index 50b23ed0..39482c54 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/pom.xml
@@ -6,7 +6,7 @@
com.xuxueli
xxl-job-executor-samples
- 2.3.0
+ 2.3.1-SNAPSHOT
xxl-job-executor-sample-frameless
jar
@@ -28,7 +28,7 @@
org.junit.jupiter
junit-jupiter-engine
- ${junit.version}
+ ${junit-jupiter.version}
test
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/FramelessApplication.java b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/FramelessApplication.java
index e259b8f5..1e7cb7dd 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/FramelessApplication.java
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/FramelessApplication.java
@@ -29,8 +29,8 @@ public class FramelessApplication {
} catch (Exception e) {
logger.error(e.getMessage(), e);
} finally {
- // destory
- FrameLessXxlJobConfig.getInstance().destoryXxlJobExecutor();
+ // destroy
+ FrameLessXxlJobConfig.getInstance().destroyXxlJobExecutor();
}
}
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/config/FrameLessXxlJobConfig.java b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/config/FrameLessXxlJobConfig.java
index eb916ad2..1d882dc5 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/config/FrameLessXxlJobConfig.java
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/config/FrameLessXxlJobConfig.java
@@ -56,9 +56,9 @@ public class FrameLessXxlJobConfig {
}
/**
- * destory
+ * destroy
*/
- public void destoryXxlJobExecutor() {
+ public void destroyXxlJobExecutor() {
if (xxlJobExecutor != null) {
xxlJobExecutor.destroy();
}
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/jobhandler/SampleXxlJob.java b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/jobhandler/SampleXxlJob.java
index d3d955a7..a4eefd14 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/jobhandler/SampleXxlJob.java
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/java/com/xxl/job/executor/sample/frameless/jobhandler/SampleXxlJob.java
@@ -244,7 +244,7 @@ public class SampleXxlJob {
logger.info("init");
}
public void destroy(){
- logger.info("destory");
+ logger.info("destroy");
}
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml
index 9782a28d..16ac25c0 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/pom.xml
@@ -6,7 +6,7 @@
com.xuxueli
xxl-job-executor-samples
- 2.3.0
+ 2.3.1-SNAPSHOT
xxl-job-executor-sample-springboot
jar
diff --git a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/SampleXxlJob.java b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/SampleXxlJob.java
index 7ea8e52d..049ace3d 100644
--- a/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/SampleXxlJob.java
+++ b/xxl-job-executor-samples/xxl-job-executor-sample-springboot/src/main/java/com/xxl/job/executor/service/jobhandler/SampleXxlJob.java
@@ -1,5 +1,6 @@
package com.xxl.job.executor.service.jobhandler;
+import com.xxl.job.core.context.XxlJobContext;
import com.xxl.job.core.context.XxlJobHelper;
import com.xxl.job.core.handler.annotation.XxlJob;
import org.slf4j.Logger;
@@ -37,10 +38,14 @@ public class SampleXxlJob {
@XxlJob("demoJobHandler")
public void demoJobHandler() throws Exception {
XxlJobHelper.log("XXL-JOB, Hello World.");
-
- for (int i = 0; i < 5; i++) {
+ XxlJobContext jobContext = XxlJobContext.getXxlJobContext();
+ logger.info("执行分片：{}， 分片总数：{}，执行参数为：{}，执行分片参数为：{}",
+ jobContext.getShardIndex(), jobContext.getShardTotal(),
+ jobContext.getJobParam(), jobContext.getJobShardingParam());
+ for (int i = 0; i < 1; i++) {
XxlJobHelper.log("beat at:" + i);
- TimeUnit.SECONDS.sleep(2);
+ logger.info("beat at:" + i);
+ TimeUnit.SECONDS.sleep(10);
}
// default success
}
@@ -246,7 +251,7 @@ public class SampleXxlJob {
logger.info("init");
}
public void destroy(){
- logger.info("destory");
+ logger.info("destroy");
}