问题优化
This commit is contained in:
parent
50b1c67943
commit
0af73afa8c
|
@ -83,8 +83,8 @@ public class XxlJobTrigger {
|
|||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regaddress")).append(":").append(group.getRegistryList());
|
||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobinfo_field_executorRouteStrategy")).append(":").append(executorRouteStrategyEnum.getTitle()).append("("+i+"/"+addressList.size()+")"); // update01
|
||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobinfo_field_executorBlockStrategy")).append(":").append(blockStrategy.getTitle());
|
||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobinfo_field_executorFailRetryCount")).append(":").append(finalFailRetryCount);
|
||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobinfo_field_timeout")).append(":").append(jobInfo.getExecutorTimeout());
|
||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobinfo_field_executorFailRetryCount")).append(":").append(finalFailRetryCount);
|
||||
|
||||
// 3、trigger-valid
|
||||
if (triggerResult.getCode()==ReturnT.SUCCESS_CODE && CollectionUtils.isEmpty(addressList)) {
|
||||
|
@ -154,8 +154,8 @@ public class XxlJobTrigger {
|
|||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regaddress")).append(":").append(group.getRegistryList());
|
||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobinfo_field_executorRouteStrategy")).append(":").append(executorRouteStrategyEnum.getTitle());
|
||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobinfo_field_executorBlockStrategy")).append(":").append(blockStrategy.getTitle());
|
||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobinfo_field_executorFailRetryCount")).append(":").append(finalFailRetryCount);
|
||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobinfo_field_timeout")).append(":").append(jobInfo.getExecutorTimeout());
|
||||
triggerMsgSb.append("<br>").append(I18nUtil.getString("jobinfo_field_executorFailRetryCount")).append(":").append(finalFailRetryCount);
|
||||
|
||||
// 3、trigger-valid
|
||||
if (triggerResult.getCode()==ReturnT.SUCCESS_CODE && CollectionUtils.isEmpty(addressList)) {
|
||||
|
|
|
@ -93,17 +93,12 @@ public class AdminBizImpl implements AdminBiz {
|
|||
|
||||
}
|
||||
} else {
|
||||
XxlJobInfo xxlJobInfo = xxlJobInfoDao.loadById(log.getJobId());
|
||||
if (xxlJobInfo.getExecutorFailRetryCount() > 0) {
|
||||
int nextFailRetryCount = xxlJobInfo.getExecutorFailRetryCount()-1;
|
||||
if (log.getExecutorFailRetryCount() > 0) {
|
||||
int nextFailRetryCount = log.getExecutorFailRetryCount()-1;
|
||||
|
||||
JobTriggerPoolHelper.trigger(log.getJobId(), nextFailRetryCount);
|
||||
ReturnT<String> retryTriggerResult = ReturnT.SUCCESS;
|
||||
|
||||
callbackMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_fail_handle_retry") +"<<<<<<<<<<< </span><br>";
|
||||
|
||||
callbackMsg += MessageFormat.format(I18nUtil.getString("jobconf_callback_msg1"),
|
||||
(retryTriggerResult.getCode()==ReturnT.SUCCESS_CODE?I18nUtil.getString("system_success"):I18nUtil.getString("system_fail")), retryTriggerResult.getMsg());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -224,7 +224,6 @@ jobconf_trigger_run=触发调度
|
|||
jobconf_trigger_child_run=触发子任务
|
||||
jobconf_callback_child_msg1={0}/{1} [任务ID={2}], 触发{3}, 触发备注: {4} <br>
|
||||
jobconf_callback_child_msg2={0}/{1} [任务ID={2}], 触发失败, 触发备注: 任务ID格式错误 <br>
|
||||
jobconf_callback_msg1=触发{0}, 触发备注: {1} <br>
|
||||
|
||||
## help
|
||||
job_help=使用教程
|
||||
|
|
|
@ -224,7 +224,6 @@ jobconf_trigger_run=Trigger Job
|
|||
jobconf_trigger_child_run=Trigger child job
|
||||
jobconf_callback_child_msg1={0}/{1} [Job ID={2}], Trigger {3}, Trigger msg: {4} <br>
|
||||
jobconf_callback_child_msg2={0}/{1} [Job ID={2}], Trigger Fail, Trigger msg: Job ID is illegal <br>
|
||||
jobconf_callback_msg1=Trigger {0}, Trigger msg: {1} <br>
|
||||
|
||||
## help
|
||||
job_help=Tutorial
|
||||
|
|
Loading…
Reference in New Issue