日志交互微调
This commit is contained in:
parent
c8fd64cb91
commit
ae05b5ce36
|
@ -1730,11 +1730,10 @@ data: post-data
|
|||
- 15、执行器注册逻辑优化:新增配置项 ”注册地址 / xxl.job.executor.address“,优先使用该配置作为注册地址,为空时使用内嵌服务 ”IP:PORT“ 作为注册地址。从而更灵活的支持容器类型执行器动态IP和动态映射端口问题。
|
||||
- 16、执行器初始化逻辑优化:修复懒加载的Bean被提前初始化问题;
|
||||
- 17、任务复制功能:点击复制是弹出新建任务弹框,并初始化被复制任务信息;
|
||||
- 18、[迭代中]自定义失败重试时间间隔;
|
||||
- 19、[迭代中]新增执行器描述、任务描述属性;
|
||||
- 20、[迭代中]任务执行一次的时候指定IP;
|
||||
- 21、[迭代中]任务日志支持单个清理和状态转移,方便触发子任务;
|
||||
- 22、[迭代中]任务结果丢失处理:针对长期处于运行中的任务(设置过期时间时,运行超过"过期时间+1min";未设置超时时间时,运行超过"30min"),主动检测该执行器是否在线,如果不在线主动标记失败;
|
||||
- 18、[迭代中]新增执行器描述、任务描述属性;
|
||||
- 19、[迭代中]任务执行一次的时候指定IP;
|
||||
- 20、[迭代中]自定义失败重试时间间隔;
|
||||
- 21、[迭代中]任务结果丢失处理:针对长期处于运行中的任务(设置过期时间时,运行超过"过期时间+1min";未设置超时时间时,运行超过"30min"),主动检测该执行器是否在线,如果不在线主动标记失败;
|
||||
|
||||
|
||||
### TODO LIST
|
||||
|
|
|
@ -176,7 +176,7 @@ joblog_handleCode_500=Fail
|
|||
joblog_handleCode_502=Timeout
|
||||
joblog_kill_log=Kill Job
|
||||
joblog_kill_log_limit=Trigger Fail, can not kill job
|
||||
joblog_kill_log_byman=Manual operation to active kill job
|
||||
joblog_kill_log_byman=Manual operation, kill job
|
||||
joblog_rolling_log=Rolling log
|
||||
joblog_rolling_log_refresh=Refresh
|
||||
joblog_rolling_log_triggerfail=The job trigger fail, can not view the rolling log
|
||||
|
|
|
@ -176,7 +176,7 @@ joblog_handleCode_500=失败
|
|||
joblog_handleCode_502=失败(超时)
|
||||
joblog_kill_log=终止任务
|
||||
joblog_kill_log_limit=调度失败,无法终止日志
|
||||
joblog_kill_log_byman=人为操作主动终止
|
||||
joblog_kill_log_byman=人为操作,主动终止
|
||||
joblog_rolling_log=执行日志
|
||||
joblog_rolling_log_refresh=刷新
|
||||
joblog_rolling_log_triggerfail=任务发起调度失败,无法查看执行日志
|
||||
|
|
|
@ -176,7 +176,7 @@ joblog_handleCode_500=失敗
|
|||
joblog_handleCode_502=失敗(超時)
|
||||
joblog_kill_log=终止任務
|
||||
joblog_kill_log_limit=調度失敗,無法终止日誌
|
||||
joblog_kill_log_byman=人為操作主動終止
|
||||
joblog_kill_log_byman=人為操作,主動終止
|
||||
joblog_rolling_log=執行日誌
|
||||
joblog_rolling_log_refresh=更新
|
||||
joblog_rolling_log_triggerfail=任務發起調度失敗,無法查看執行日誌
|
||||
|
|
|
@ -180,11 +180,27 @@ $(function() {
|
|||
// better support expression or string, not function
|
||||
return function () {
|
||||
if (row.triggerCode == 200 || row.handleCode != 0){
|
||||
var temp = '<a href="javascript:;" class="logDetail" _id="'+ row.id +'">'+ I18n.joblog_rolling_log +'</a>';
|
||||
|
||||
/*var temp = '<a href="javascript:;" class="logDetail" _id="'+ row.id +'">'+ I18n.joblog_rolling_log +'</a>';
|
||||
if(row.handleCode == 0){
|
||||
temp += '<br><a href="javascript:;" class="logKill" _id="'+ row.id +'" style="color: red;" >'+ I18n.joblog_kill_log +'</a>';
|
||||
}
|
||||
return temp;
|
||||
}*/
|
||||
//return temp;
|
||||
|
||||
var html = '<div class="btn-group">\n' +
|
||||
' <button type="button" class="btn btn-primary btn-sm">'+ I18n.system_opt +'</button>\n' +
|
||||
' <button type="button" class="btn btn-primary btn-sm dropdown-toggle" data-toggle="dropdown">\n' +
|
||||
' <span class="caret"></span>\n' +
|
||||
' <span class="sr-only">Toggle Dropdown</span>\n' +
|
||||
' </button>\n' +
|
||||
' <ul class="dropdown-menu" role="menu" _id="'+ row.id +'" >\n' +
|
||||
' <li><a href="javascript:void(0);" class="logDetail" _id="'+ row.id +'" >'+ I18n.joblog_rolling_log +'</a></li>\n' +
|
||||
' <li class="divider"></li>\n' +
|
||||
' <li><a href="javascript:void(0);" class="logKill" _id="'+ row.id +'" >'+ I18n.joblog_kill_log +'</a></li>\n' +
|
||||
' </ul>\n' +
|
||||
' </div>';
|
||||
|
||||
return html;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue