Authored by Gino Zhang

更新KisJob日志信息

@@ -2,6 +2,7 @@ package com.yoho.kisjob.common.constant; @@ -2,6 +2,7 @@ package com.yoho.kisjob.common.constant;
2 2
3 /** 3 /**
4 * 任务异常 4 * 任务异常
  5 + *
5 * @author zhangfeng 6 * @author zhangfeng
6 * @since 2016-07-13 7 * @since 2016-07-13
7 */ 8 */
@@ -11,7 +12,9 @@ public class JobException extends RuntimeException { @@ -11,7 +12,9 @@ public class JobException extends RuntimeException {
11 12
12 /** 13 /**
13 * 支持错误码的异常 暂不启动 14 * 支持错误码的异常 暂不启动
14 - * @param errorCode 错误码 15 + *
  16 + * @param errorCode
  17 + * 错误码
15 */ 18 */
16 @Deprecated 19 @Deprecated
17 public JobException(int errorCode) { 20 public JobException(int errorCode) {
@@ -103,7 +103,7 @@ public class DistributedJob extends AbstractJob { @@ -103,7 +103,7 @@ public class DistributedJob extends AbstractJob {
103 // 处理节点不可用的情况 103 // 处理节点不可用的情况
104 // TODO:处理失效转移的情况 暂时先不支持 都设置为失败 104 // TODO:处理失效转移的情况 暂时先不支持 都设置为失败
105 registerCenter.endExecuteGroup(jobInstId, meta.getGroupIndex(), new JobException( 105 registerCenter.endExecuteGroup(jobInstId, meta.getGroupIndex(), new JobException(
106 - "The job node is unavailable.")); 106 + "The job node %s is unavailable.", meta.getNodeIdentifier()));
107 } 107 }
108 } 108 }
109 } 109 }
@@ -157,19 +157,19 @@ public class DistributedJob extends AbstractJob { @@ -157,19 +157,19 @@ public class DistributedJob extends AbstractJob {
157 157
158 @Override 158 @Override
159 public void pause() { 159 public void pause() {
160 - //TODO:支持暂停、恢复和取消 160 + // TODO:支持暂停、恢复和取消
161 super.pause(); 161 super.pause();
162 } 162 }
163 163
164 @Override 164 @Override
165 public void resume() { 165 public void resume() {
166 - //TODO:支持暂停、恢复和取消 166 + // TODO:支持暂停、恢复和取消
167 super.resume(); 167 super.resume();
168 } 168 }
169 169
170 @Override 170 @Override
171 public void cancel() { 171 public void cancel() {
172 - //TODO:支持暂停、恢复和取消 172 + // TODO:支持暂停、恢复和取消
173 super.cancel(); 173 super.cancel();
174 } 174 }
175 } 175 }
@@ -15,7 +15,7 @@ public class TestBaseJob extends AbstractJob { @@ -15,7 +15,7 @@ public class TestBaseJob extends AbstractJob {
15 15
16 @Override 16 @Override
17 public void execute() { 17 public void execute() {
18 - log.debug("Hello world. " + new Date() + " JobName: " + JobContextHolder.getContext().getJobName()); 18 + log.info("Hello world. " + new Date() + " JobName: " + JobContextHolder.getContext().getJobName());
19 } 19 }
20 20
21 } 21 }
@@ -26,5 +26,4 @@ public class TestMapper implements Mapper { @@ -26,5 +26,4 @@ public class TestMapper implements Mapper {
26 } 26 }
27 log.debug("End to map."); 27 log.debug("End to map.");
28 } 28 }
29 -  
30 } 29 }
@@ -10,26 +10,14 @@ @@ -10,26 +10,14 @@
10 http://vm.yoho.com/schema/kisjob/job/job.xsd 10 http://vm.yoho.com/schema/kisjob/job/job.xsd
11 "> 11 ">
12 12
13 - <context:component-scan base-package="com.yoho.kisjob" /> 13 + <context:component-scan base-package="com.yoho.kisjob.demo" />
14 14
15 - <job:define id="jobDemo1" job-type="clusterJob" job-ref="testBaseJob">  
16 - <job:timer job-run-type="realtime" />  
17 - </job:define>  
18 -  
19 - <job:define id="jobDemo2" job-type="singleJob" job-ref="testBaseJob">  
20 - <job:timer job-run-type="onetime" run-time="2018-01-01 00:00:00" />  
21 - </job:define>  
22 -  
23 - <job:define id="jobDemo11" job-type="clusterJob" job-ref="testBaseJob">  
24 - <job:timer job-run-type="cron" cron="0 * * * * ?" />  
25 - </job:define>  
26 -  
27 - <job:define id="jobDemo12" job-type="singleJob" job-ref="testBaseJob"> 15 + <job:define id="jobDemo1" job-type="singleJob" job-ref="testBaseJob">
28 <job:timer job-run-type="cron" cron="20 * * * * ?" /> 16 <job:timer job-run-type="cron" cron="20 * * * * ?" />
29 </job:define> 17 </job:define>
30 18
31 - <job:define id="jobDemo13" job-type="elastaicJob"  
32 - mapper-ref="testMapper" executor-ref="testExecutor"> 19 + <job:define id="jobDemo2" job-type="elastaicJob" mapper-ref="testMapper"
  20 + executor-ref="testExecutor">
33 <job:param name="param1" value="value1" /> 21 <job:param name="param1" value="value1" />
34 <job:param name="param2" value="value2" /> 22 <job:param name="param2" value="value2" />
35 <job:timer job-run-type="cron" cron="40 * * * * ?" /> 23 <job:timer job-run-type="cron" cron="40 * * * * ?" />