瀏覽代碼

修正TriggerParam的LogDateTim为LogDateTime

wang_yangbj 5 年之前
父節點
當前提交
7f969ae12c

+ 1 - 1
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java 查看文件

116
         triggerParam.setExecutorBlockStrategy(jobInfo.getExecutorBlockStrategy());
116
         triggerParam.setExecutorBlockStrategy(jobInfo.getExecutorBlockStrategy());
117
         triggerParam.setExecutorTimeout(jobInfo.getExecutorTimeout());
117
         triggerParam.setExecutorTimeout(jobInfo.getExecutorTimeout());
118
         triggerParam.setLogId(jobLog.getId());
118
         triggerParam.setLogId(jobLog.getId());
119
-        triggerParam.setLogDateTim(jobLog.getTriggerTime().getTime());
119
+        triggerParam.setLogDateTime(jobLog.getTriggerTime().getTime());
120
         triggerParam.setGlueType(jobInfo.getGlueType());
120
         triggerParam.setGlueType(jobInfo.getGlueType());
121
         triggerParam.setGlueSource(jobInfo.getGlueSource());
121
         triggerParam.setGlueSource(jobInfo.getGlueSource());
122
         triggerParam.setGlueUpdatetime(jobInfo.getGlueUpdatetime().getTime());
122
         triggerParam.setGlueUpdatetime(jobInfo.getGlueUpdatetime().getTime());

+ 1 - 1
xxl-job-admin/src/test/java/com/xxl/job/executor/ExecutorBizTest.java 查看文件

45
         triggerParam.setGlueSource(null);
45
         triggerParam.setGlueSource(null);
46
         triggerParam.setGlueUpdatetime(System.currentTimeMillis());
46
         triggerParam.setGlueUpdatetime(System.currentTimeMillis());
47
         triggerParam.setLogId(1);
47
         triggerParam.setLogId(1);
48
-        triggerParam.setLogDateTim(System.currentTimeMillis());
48
+        triggerParam.setLogDateTime(System.currentTimeMillis());
49
 
49
 
50
         // do remote trigger
50
         // do remote trigger
51
         String accessToken = null;
51
         String accessToken = null;

+ 6 - 6
xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java 查看文件

16
     private int executorTimeout;
16
     private int executorTimeout;
17
 
17
 
18
     private long logId;
18
     private long logId;
19
-    private long logDateTim;
19
+    private long logDateTime;
20
 
20
 
21
     private String glueType;
21
     private String glueType;
22
     private String glueSource;
22
     private String glueSource;
74
         this.logId = logId;
74
         this.logId = logId;
75
     }
75
     }
76
 
76
 
77
-    public long getLogDateTim() {
78
-        return logDateTim;
77
+    public long getLogDateTime() {
78
+        return logDateTime;
79
     }
79
     }
80
 
80
 
81
-    public void setLogDateTim(long logDateTim) {
82
-        this.logDateTim = logDateTim;
81
+    public void setLogDateTime(long logDateTime) {
82
+        this.logDateTime = logDateTime;
83
     }
83
     }
84
 
84
 
85
     public String getGlueType() {
85
     public String getGlueType() {
132
                 ", executorBlockStrategy='" + executorBlockStrategy + '\'' +
132
                 ", executorBlockStrategy='" + executorBlockStrategy + '\'' +
133
                 ", executorTimeout=" + executorTimeout +
133
                 ", executorTimeout=" + executorTimeout +
134
                 ", logId=" + logId +
134
                 ", logId=" + logId +
135
-                ", logDateTim=" + logDateTim +
135
+                ", logDateTime=" + logDateTime +
136
                 ", glueType='" + glueType + '\'' +
136
                 ", glueType='" + glueType + '\'' +
137
                 ", glueSource='" + glueSource + '\'' +
137
                 ", glueSource='" + glueSource + '\'' +
138
                 ", glueUpdatetime=" + glueUpdatetime +
138
                 ", glueUpdatetime=" + glueUpdatetime +

+ 4 - 4
xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java 查看文件

116
 					triggerLogIdSet.remove(triggerParam.getLogId());
116
 					triggerLogIdSet.remove(triggerParam.getLogId());
117
 
117
 
118
 					// log filename, like "logPath/yyyy-MM-dd/9999.log"
118
 					// log filename, like "logPath/yyyy-MM-dd/9999.log"
119
-					String logFileName = XxlJobFileAppender.makeLogFileName(new Date(triggerParam.getLogDateTim()), triggerParam.getLogId());
119
+					String logFileName = XxlJobFileAppender.makeLogFileName(new Date(triggerParam.getLogDateTime()), triggerParam.getLogId());
120
 					XxlJobFileAppender.contextHolder.set(logFileName);
120
 					XxlJobFileAppender.contextHolder.set(logFileName);
121
 					ShardingUtil.setShardingVo(new ShardingUtil.ShardingVO(triggerParam.getBroadcastIndex(), triggerParam.getBroadcastTotal()));
121
 					ShardingUtil.setShardingVo(new ShardingUtil.ShardingVO(triggerParam.getBroadcastIndex(), triggerParam.getBroadcastTotal()));
122
 
122
 
184
                     // callback handler info
184
                     // callback handler info
185
                     if (!toStop) {
185
                     if (!toStop) {
186
                         // commonm
186
                         // commonm
187
-                        TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogDateTim(), executeResult));
187
+                        TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogDateTime(), executeResult));
188
                     } else {
188
                     } else {
189
                         // is killed
189
                         // is killed
190
                         ReturnT<String> stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [job running,killed]");
190
                         ReturnT<String> stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [job running,killed]");
191
-                        TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogDateTim(), stopResult));
191
+                        TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogDateTime(), stopResult));
192
                     }
192
                     }
193
                 }
193
                 }
194
             }
194
             }
200
 			if (triggerParam!=null) {
200
 			if (triggerParam!=null) {
201
 				// is killed
201
 				// is killed
202
 				ReturnT<String> stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [job not executed, in the job queue, killed.]");
202
 				ReturnT<String> stopResult = new ReturnT<String>(ReturnT.FAIL_CODE, stopReason + " [job not executed, in the job queue, killed.]");
203
-				TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogDateTim(), stopResult));
203
+				TriggerCallbackThread.pushCallBack(new HandleCallbackParam(triggerParam.getLogId(), triggerParam.getLogDateTime(), stopResult));
204
 			}
204
 			}
205
 		}
205
 		}
206
 
206
 

+ 1 - 1
xxl-job-core/src/test/java/com/xxl/job/core/biz/impl/ExecutorBizImplTest.java 查看文件

131
         triggerParam.setGlueSource(null);
131
         triggerParam.setGlueSource(null);
132
         triggerParam.setGlueUpdatetime(System.currentTimeMillis());
132
         triggerParam.setGlueUpdatetime(System.currentTimeMillis());
133
         triggerParam.setLogId(1);
133
         triggerParam.setLogId(1);
134
-        triggerParam.setLogDateTim(System.currentTimeMillis());
134
+        triggerParam.setLogDateTime(System.currentTimeMillis());
135
 
135
 
136
         // Act
136
         // Act
137
         final ReturnT<String> retval = executorBiz.run(triggerParam);
137
         final ReturnT<String> retval = executorBiz.run(triggerParam);