diff --git "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" index 9236735a35c5b40c6dece535957c091235eb3c8d..c3c295afb2add91c8ef2a55c5318f85e843e0820 100644 --- "a/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" +++ "b/doc/XXL-JOB\345\256\230\346\226\271\346\226\207\346\241\243.md" @@ -1234,6 +1234,7 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 15、脚本任务Log文件流关闭优化； - 16、任务报表成功、失败和进行中统计问题修复； - 17、自研Log组件参数占位符改为"{}"，并修复打印有参日志时参数不匹配导致报错的问题； +- 18、核心依赖Core内部国际化处理； ### TODO LIST @@ -1255,10 +1256,9 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 - 16、新增任务默认运行状态，任务更新时运行状态保持不变； - 17、提供多版本执行器：不依赖容器版本、不内嵌Jetty版本（通过配置executoraddress替换jetty通讯）等； - 18、注册中心支持扩展，除默认基于DB之外，支持扩展接入第三方注册中心如zk、eureka等； -- 19、依赖Core内部国际化处理； -- 20、流程任务，支持参数传递； -- 21、SimpleTrigger 支持； -- 22、支持通过API服务操作任务信息； +- 19、流程任务，支持参数传递； +- 20、SimpleTrigger 支持； +- 21、支持通过API服务操作任务信息； ## 七、其他 diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java b/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java index 885ae3f914d957f187fd329acc8fde22bd96e9ff..e5b90b7a773108ced6351440b35cb1bd43778853 100644 --- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java +++ b/xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java @@ -50,7 +50,7 @@ public class ExecutorBizImpl implements ExecutorBiz { // kill handlerThread, and create new one JobThread jobThread = XxlJobExecutor.loadJobThread(jobId); if (jobThread != null) { - XxlJobExecutor.removeJobThread(jobId, "人工手动终止"); + XxlJobExecutor.removeJobThread(jobId, "scheduling center kill job."); return ReturnT.SUCCESS; } @@ -83,7 +83,7 @@ public class ExecutorBizImpl implements ExecutorBiz { // valid old jobThread if (jobThread!=null && jobHandler != newJobHandler) { // change handler, need kill old thread - removeOldReason = "更换JobHandler或更换任务模式,终止旧任务线程"; + removeOldReason = "change jobhandler or glue type, and terminate the old job thread."; jobThread = null; jobHandler = null; @@ -104,7 +104,7 @@ public class ExecutorBizImpl implements ExecutorBiz { !(jobThread.getHandler() instanceof GlueJobHandler && ((GlueJobHandler) jobThread.getHandler()).getGlueUpdatetime()==triggerParam.getGlueUpdatetime() )) { // change handler or gluesource updated, need kill old thread - removeOldReason = "更新任务逻辑或更换任务模式,终止旧任务线程"; + removeOldReason = "change job source or glue type, and terminate the old job thread."; jobThread = null; jobHandler = null; @@ -127,7 +127,7 @@ public class ExecutorBizImpl implements ExecutorBiz { !(jobThread.getHandler() instanceof ScriptJobHandler && ((ScriptJobHandler) jobThread.getHandler()).getGlueUpdatetime()==triggerParam.getGlueUpdatetime() )) { // change script or gluesource updated, need kill old thread - removeOldReason = "更新任务逻辑或更换任务模式,终止旧任务线程"; + removeOldReason = "change job source or glue type, and terminate the old job thread."; jobThread = null; jobHandler = null; @@ -147,12 +147,12 @@ public class ExecutorBizImpl implements ExecutorBiz { if (ExecutorBlockStrategyEnum.DISCARD_LATER == blockStrategy) { // discard when running if (jobThread.isRunningOrHasQueue()) { - return new ReturnT(ReturnT.FAIL_CODE, "阻塞处理策略-生效："+ExecutorBlockStrategyEnum.DISCARD_LATER.getTitle()); + return new ReturnT(ReturnT.FAIL_CODE, "block strategy effect："+ExecutorBlockStrategyEnum.DISCARD_LATER.getTitle()); } } else if (ExecutorBlockStrategyEnum.COVER_EARLY == blockStrategy) { // kill running jobThread if (jobThread.isRunningOrHasQueue()) { - removeOldReason = "阻塞处理策略-生效：" + ExecutorBlockStrategyEnum.COVER_EARLY.getTitle(); + removeOldReason = "block strategy effect：" + ExecutorBlockStrategyEnum.COVER_EARLY.getTitle(); jobThread = null; } 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 ac2324f4075a2592f5fd16c216296d500ce3ecb6..f25502b3463d2988a5d8c503322f16e967a9df43 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 @@ -91,7 +91,7 @@ public class XxlJobExecutor implements ApplicationContextAware { // destory JobThreadRepository if (JobThreadRepository.size() > 0) { for (Map.Entry item: JobThreadRepository.entrySet()) { - removeJobThread(item.getKey(), "Web容器销毁终止"); + removeJobThread(item.getKey(), "web container destroy and kill the job."); } JobThreadRepository.clear(); } 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 81b839a7b5c8357f170934c176fa922a66193b0e..290b7e54ea86c8c042d41be6251e8d1440758e0a 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 @@ -181,7 +181,7 @@ public class JobThread extends Thread{ TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogDateTim(), executeResult)); } else { // is killed - ReturnT stopResult = new ReturnT(ReturnT.FAIL_CODE, stopReason + " [业务运行中，被强制终止]"); + ReturnT stopResult = new ReturnT(ReturnT.FAIL_CODE, stopReason + " [job running，killed]"); TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogDateTim(), stopResult)); } } @@ -193,7 +193,7 @@ public class JobThread extends Thread{ TriggerParam triggerParam = triggerQueue.poll(); if (triggerParam!=null) { // is killed - ReturnT stopResult = new ReturnT(ReturnT.FAIL_CODE, stopReason + " [任务尚未执行，在调度队列中被终止]"); + ReturnT stopResult = new ReturnT(ReturnT.FAIL_CODE, stopReason + " [job not executed, in the job queue, killed.]"); TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogDateTim(), stopResult)); } }