Skip to content

Commit 7628056

Browse files
author
胡贵
committed
加入 SystemClock
1 parent be20668 commit 7628056

File tree

37 files changed

+186
-73
lines changed

37 files changed

+186
-73
lines changed

‎lts-admin/src/main/java/com/lts/web/controller/api/JobQueueApiController.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.lts.core.commons.utils.DateUtils;
99
import com.lts.core.domain.JobQueueRequest;
1010
import com.lts.core.support.CronExpression;
11+
import com.lts.core.support.SystemClock;
1112
import com.lts.queue.domain.JobPo;
1213
import com.lts.web.cluster.AdminApplication;
1314
import com.lts.web.controller.AbstractController;
@@ -163,7 +164,7 @@ private void addJob(JobQueueRequest request, Long triggerTime) {
163164
jobPo.setJobId(StringUtils.generateUUID());
164165
jobPo.setCronExpression(request.getCronExpression());
165166
jobPo.setExtParams(request.getExtParams());
166-
jobPo.setGmtCreated(DateUtils.currentTimeMillis());
167+
jobPo.setGmtCreated(SystemClock.now());
167168
jobPo.setGmtModified(jobPo.getGmtCreated());
168169
jobPo.setNeedFeedback(request.getNeedFeedback());
169170
jobPo.setPriority(request.getPriority());
@@ -181,7 +182,7 @@ private void addJob(JobQueueRequest request, Long triggerTime) {
181182
}
182183
}
183184
if (jobPo.getTriggerTime() == null) {
184-
jobPo.setTriggerTime(DateUtils.currentTimeMillis());
185+
jobPo.setTriggerTime(SystemClock.now());
185186
}
186187

187188
application.getExecutableJobQueue().add(jobPo);

‎lts-admin/src/main/webapp/main/job-logger.jsp‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,12 @@
6969
7070
var columns = [
7171
{
72-
title: '日志时间', dataIndex: 'timestamp', width: 125, renderer: function (v) {
72+
title: '日志记录时间', dataIndex: 'logTime', width: 125, renderer: function (v) {
73+
return DateUtil.formatYMDHMD(v);
74+
}
75+
},
76+
{
77+
title: '日志创建时间', dataIndex: 'gmtCreated', width: 125, renderer: function (v) {
7378
return DateUtil.formatYMDHMD(v);
7479
}
7580
},

‎lts-admin/src/test/java/com/lts/biz/logger/mysql/MysqlJobLoggerTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.lts.core.commons.utils.DateUtils;
77
import com.lts.core.constant.Level;
88
import com.lts.core.domain.Job;
9+
import com.lts.core.support.SystemClock;
910
import org.junit.Test;
1011

1112
import java.util.ArrayList;
@@ -33,8 +34,8 @@ public void testLog() throws Exception {
3334
List<JobLogPo> jobLogPoList = new ArrayList<JobLogPo>();
3435

3536
JobLogPo jobLogPo = new JobLogPo();
36-
jobLogPo.setGmtCreated(DateUtils.currentTimeMillis());
37-
jobLogPo.setLogTime(DateUtils.currentTimeMillis());
37+
jobLogPo.setGmtCreated(SystemClock.now());
38+
jobLogPo.setLogTime(SystemClock.now());
3839
jobLogPo.setLevel(Level.INFO);
3940
jobLogPo.setLogType(LogType.BIZ);
4041
jobLogPoList.add(jobLogPo);

‎lts-core/src/main/java/com/lts/core/cluster/AbstractJobNode.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import com.lts.core.logger.Logger;
1313
import com.lts.core.logger.LoggerFactory;
1414
import com.lts.core.registry.*;
15+
import com.lts.core.support.SystemClock;
1516
import com.lts.ec.EventCenterFactory;
1617
import com.lts.core.listener.SelfChangeListener;
1718
import com.lts.core.protocol.command.CommandBodyWrapper;
@@ -46,7 +47,6 @@ public AbstractJobNode() {
4647

4748
final public void start() {
4849
try {
49-
5050
// 初始化配置
5151
initConfig();
5252

‎lts-core/src/main/java/com/lts/core/cluster/Node.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.lts.core.cluster;
22

33
import com.lts.core.registry.NodeRegistryUtils;
4+
import com.lts.core.support.SystemClock;
45

56
import java.util.ArrayList;
67
import java.util.List;
@@ -18,7 +19,7 @@ public class Node {
1819
private String ip;
1920
private Integer port;
2021
private String group;
21-
private Long createTime = System.currentTimeMillis();
22+
private Long createTime = SystemClock.instance().now();
2223
// 线程个数
2324
private Integer threads;
2425
// 唯一标识

‎lts-core/src/main/java/com/lts/core/domain/Job.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class Job {
3232
// 是否要反馈给客户端
3333
private boolean needFeedback = true;
3434
// 重试次数
35-
private int retryTimes;
35+
private int retryTimes = 0;
3636
/**
3737
* 执行表达式 和 quartz 的一样
3838
* 如果这个为空，表示立即执行的

‎lts-core/src/main/java/com/lts/core/protocol/command/AbstractCommandBody.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.lts.core.protocol.command;
22

3+
import com.lts.core.support.SystemClock;
34
import com.lts.remoting.CommandBody;
45
import com.lts.remoting.annotation.NotNull;
56
import com.lts.remoting.annotation.Nullable;
@@ -32,7 +33,7 @@ public class AbstractCommandBody implements CommandBody {
3233
@NotNull
3334
private String identity;
3435

35-
private Long timestamp = System.currentTimeMillis();
36+
private Long timestamp = SystemClock.now();
3637

3738
// 额外的参数
3839
@Nullable

‎lts-core/src/main/java/com/lts/core/registry/redis/RedisRegistry.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
import com.lts.core.exception.NodeRegistryException;
99
import com.lts.core.factory.NamedThreadFactory;
1010
import com.lts.core.logger.Logger;
11+
import com.lts.core.logger.LoggerFactory;
1112
import com.lts.core.registry.FailbackRegistry;
1213
import com.lts.core.registry.NodeRegistryUtils;
13-
import com.lts.core.registry.NotifyListener;
14-
import com.lts.core.logger.LoggerFactory;
1514
import com.lts.core.registry.NotifyEvent;
15+
import com.lts.core.registry.NotifyListener;
16+
import com.lts.core.support.SystemClock;
1617
import org.apache.commons.pool.impl.GenericObjectPool;
1718
import redis.clients.jedis.Jedis;
1819
import redis.clients.jedis.JedisPool;
@@ -83,7 +84,7 @@ private void deferExpired() {
8384
try {
8485
for (Node node : new HashSet<Node>(getRegistered())) {
8586
String key = NodeRegistryUtils.getNodeTypePath(clusterName, node.getNodeType());
86-
if (jedis.hset(key, node.toFullString(), String.valueOf(System.currentTimeMillis() + expirePeriod)) == 1) {
87+
if (jedis.hset(key, node.toFullString(), String.valueOf(SystemClock.now() + expirePeriod)) == 1) {
8788
jedis.publish(key, Constants.REGISTER);
8889
}
8990
}
@@ -103,7 +104,7 @@ private void deferExpired() {
103104
@Override
104105
protected void doRegister(Node node) {
105106
String key = NodeRegistryUtils.getNodeTypePath(clusterName, node.getNodeType());
106-
String expire = String.valueOf(System.currentTimeMillis() + expirePeriod);
107+
String expire = String.valueOf(SystemClock.now() + expirePeriod);
107108
boolean success = false;
108109
NodeRegistryException exception = null;
109110
for (Map.Entry<String, JedisPool> entry : jedisPools.entrySet()) {

‎lts-core/src/main/java/com/lts/core/remoting/HeartBeatMonitor.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ public void run() {
8282
}
8383
}, 30, 30, TimeUnit.SECONDS); // 30s 一次心跳
8484
}
85-
LOGGER.info("Start heart beat monitor success!");
85+
LOGGER.info("Start slow ping success.");
8686
}
8787
} catch (Throwable t) {
88-
LOGGER.error("Start heart beat monitor failed!", t);
88+
LOGGER.error("Start slow ping failed.", t);
8989
}
9090
}
9191

@@ -95,10 +95,10 @@ private void stopPing() {
9595
// pingScheduledFuture.cancel(true);
9696
// PING_EXECUTOR_SERVICE.shutdown();
9797
application.getEventCenter().unSubscribe(EcTopic.NO_JOB_TRACKER_AVAILABLE, eventSubscriber);
98-
LOGGER.info("Stop heart beat monitor success!");
98+
LOGGER.info("Stop slow ping success.");
9999
}
100100
} catch (Throwable t) {
101-
LOGGER.error("Stop heart beat monitor failed!", t);
101+
LOGGER.error("Stop slow ping failed.", t);
102102
}
103103
}
104104

@@ -117,9 +117,9 @@ public void run() {
117117
}
118118
}, 1, 2, TimeUnit.MILLISECONDS);
119119
}
120-
LOGGER.info("Start fast ping runner success!");
120+
LOGGER.info("Start fast ping success.");
121121
} catch (Throwable t) {
122-
LOGGER.error("Start fast ping runner failed!", t);
122+
LOGGER.error("Start fast ping failed.", t);
123123
}
124124
}
125125
}
@@ -129,10 +129,10 @@ private void stopFastPing() {
129129
if (fastPingStart.compareAndSet(true, false)) {
130130
// fastPingScheduledFuture.cancel(true);
131131
// FAST_PING_EXECUTOR.shutdown();
132-
LOGGER.info("Stop fast ping runner success!");
132+
LOGGER.info("Stop fast ping success.");
133133
}
134134
} catch (Throwable t) {
135-
LOGGER.error("Stop fast ping runner failed!", t);
135+
LOGGER.error("Stop fast ping failed.", t);
136136
}
137137
}
138138

@@ -193,7 +193,7 @@ private boolean beat(RemotingClientDelegate remotingClient, String addr) {
193193
if (response != null && JobProtos.ResponseCode.HEART_BEAT_SUCCESS ==
194194
JobProtos.ResponseCode.valueOf(response.getCode())) {
195195
if (LOGGER.isDebugEnabled()) {
196-
LOGGER.debug("heart beat success! ");
196+
LOGGER.debug("heart beat success. ");
197197
}
198198
return true;
199199
}

‎lts-core/src/main/java/com/lts/core/support/LoggerName.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.lts.core.support;
2+
3+
/**
4+
* Created by hugui on 6/13/15.
5+
*/
6+
public interface LoggerName {
7+
8+
public static final String TaskTracker = "LTS.TaskTracker";
9+
10+
public static final String JobClient = "LTS.JobClient";
11+
12+
public static final String JobTracker = "LTS.JobTracker";
13+
14+
}

0 commit comments

Comments
 (0)