Commit 6cd48c0f by huangfusuper

解决开始节点异常不能够被捕获的BUG

parent e69d8531
...@@ -121,12 +121,11 @@ public class JobTaskThreadRunHelper extends BaseThreadRunHelper { ...@@ -121,12 +121,11 @@ public class JobTaskThreadRunHelper extends BaseThreadRunHelper {
} }
} }
} else { } else {
//先处理开始节点 try {
if(NodeNameEnum.START_NODE.getNodeName().equals(jobTask.getNodeName())){ //先处理开始节点
startNodeOperating(jobTask,jobTaskSchedules); if(NodeNameEnum.START_NODE.getNodeName().equals(jobTask.getNodeName())){
}else { startNodeOperating(jobTask,jobTaskSchedules);
//普通节点 }else {
try {
//如果是补批节点 而且没有依赖节点的话,按照开始节点处理 //如果是补批节点 而且没有依赖节点的话,按照开始节点处理
if( ScheduleTypeEnum.REPAIR.getCode().equals(jobTask.getScheduleType()) && StringUtils.isBlank(jobTask.getNodeDepend())){ if( ScheduleTypeEnum.REPAIR.getCode().equals(jobTask.getScheduleType()) && StringUtils.isBlank(jobTask.getNodeDepend())){
startNodeOperating(jobTask,jobTaskSchedules); startNodeOperating(jobTask,jobTaskSchedules);
...@@ -136,21 +135,22 @@ public class JobTaskThreadRunHelper extends BaseThreadRunHelper { ...@@ -136,21 +135,22 @@ public class JobTaskThreadRunHelper extends BaseThreadRunHelper {
//断定上级节点是否执行成功 //断定上级节点是否执行成功
runJobTask(jobTask,jobTaskSchedules); runJobTask(jobTask,jobTaskSchedules);
} }
}catch (SuperiorNodeRunException se) { }
//删除这个数据 并且添加到日志 }catch (SuperiorNodeRunException se) {
try { //删除这个数据 并且添加到日志
taskAndLogServer.addRunLogAndRemoveTask(jobTask,false,false); try {
} catch (UnknownHostException e) { taskAndLogServer.addRunLogAndRemoveTask(jobTask,false,false);
log.error("-----------------节点执行时出现异常,{}----------",e.getMessage()); } catch (UnknownHostException e) {
} log.error("-----------------节点执行时出现异常,{}----------",e.getMessage());
}catch (Exception businessException) { }
try { }catch (Exception businessException) {
taskAndLogServer.addRunLogAndRemoveTask(jobTask,false,true); try {
} catch (UnknownHostException e) { taskAndLogServer.addRunLogAndRemoveTask(jobTask,false,true);
log.error("-----------------节点执行时出现异常,{}----------",e.getMessage()); } catch (UnknownHostException e) {
} log.error("-----------------节点执行时出现异常,{}----------",e.getMessage());
} }
} }
} }
} }
//执行保存到排表 删除任务表操作 //执行保存到排表 删除任务表操作
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment