Browse Source

任务调度备注中标注任务触发类型,如Cron触发、父任务触发、API触发等等,方便排查调度日志;

xuxueli 7 years ago
parent
commit
b972ca4efb

+ 3 - 2
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java View File

76
                 ReturnT<String> triggerResult = new ReturnT<String>(null);
76
                 ReturnT<String> triggerResult = new ReturnT<String>(null);
77
                 StringBuffer triggerMsgSb = new StringBuffer();
77
                 StringBuffer triggerMsgSb = new StringBuffer();
78
                 triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_type")).append(":").append(type);
78
                 triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_type")).append(":").append(type);
79
-                triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_admin_adress")).append(":").append(IpUtil.getIp());
79
+                triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_admin_adress")).append(":").append(IpUtil.getIp());
80
                 triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regtype")).append(":")
80
                 triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regtype")).append(":")
81
                         .append( (group.getAddressType() == 0)?I18nUtil.getString("jobgroup_field_addressType_0"):I18nUtil.getString("jobgroup_field_addressType_1") );
81
                         .append( (group.getAddressType() == 0)?I18nUtil.getString("jobgroup_field_addressType_0"):I18nUtil.getString("jobgroup_field_addressType_1") );
82
                 triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regaddress")).append(":").append(group.getRegistryList());
82
                 triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regaddress")).append(":").append(group.getRegistryList());
134
 
134
 
135
             ReturnT<String> triggerResult = new ReturnT<String>(null);
135
             ReturnT<String> triggerResult = new ReturnT<String>(null);
136
             StringBuffer triggerMsgSb = new StringBuffer();
136
             StringBuffer triggerMsgSb = new StringBuffer();
137
-            triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_admin_adress")).append(":").append(IpUtil.getIp());
137
+            triggerMsgSb.append(I18nUtil.getString("jobconf_trigger_type")).append(":").append(type);
138
+            triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_admin_adress")).append(":").append(IpUtil.getIp());
138
             triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regtype")).append(":")
139
             triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regtype")).append(":")
139
                     .append( (group.getAddressType() == 0)?I18nUtil.getString("jobgroup_field_addressType_0"):I18nUtil.getString("jobgroup_field_addressType_1") );
140
                     .append( (group.getAddressType() == 0)?I18nUtil.getString("jobgroup_field_addressType_0"):I18nUtil.getString("jobgroup_field_addressType_1") );
140
             triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regaddress")).append(":").append(group.getRegistryList());
141
             triggerMsgSb.append("<br>").append(I18nUtil.getString("jobconf_trigger_exe_regaddress")).append(":").append(group.getRegistryList());

+ 6 - 0
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js View File

98
                         "width":'10%',
98
                         "width":'10%',
99
 						"render": function ( data, type, row ) {
99
 						"render": function ( data, type, row ) {
100
 
100
 
101
+							var jobhandler = '';
102
+                            if (row.executorHandler) {
103
+                                jobhandler = "<br>JobHandler:" + row.executorHandler;
104
+                            }
105
+
101
 							var temp = '';
106
 							var temp = '';
102
 							temp += I18n.joblog_field_executorAddress + ':' + (row.executorAddress?row.executorAddress:'');
107
 							temp += I18n.joblog_field_executorAddress + ':' + (row.executorAddress?row.executorAddress:'');
108
+							temp += jobhandler;
103
 							temp += '<br>'+ I18n.jobinfo_field_executorparam +':' + row.executorParam;
109
 							temp += '<br>'+ I18n.jobinfo_field_executorparam +':' + row.executorParam;
104
 
110
 
105
 							return '<a class="logTips" href="javascript:;" >'+ row.jobId +'<span style="display:none;">'+ temp +'</span></a>';
111
 							return '<a class="logTips" href="javascript:;" >'+ row.jobId +'<span style="display:none;">'+ temp +'</span></a>';