diff --git a/lts-core/src/main/java/com/lts/core/support/RetryScheduler.java b/lts-core/src/main/java/com/lts/core/support/RetryScheduler.java index a6b2c918e..7d2d6869e 100644 --- a/lts-core/src/main/java/com/lts/core/support/RetryScheduler.java +++ b/lts-core/src/main/java/com/lts/core/support/RetryScheduler.java @@ -35,6 +35,8 @@ public abstract class RetryScheduler { private ScheduledFuture scheduledFuture; private AtomicBoolean start = new AtomicBoolean(false); private FailStore failStore; + // 名称主要是用来记录日志 + private String name; // 批量发送的消息数 private int batchSize = 5; @@ -47,6 +49,7 @@ public RetryScheduler(Application application, String storePath) { FailStoreFactory failStoreFactory = ExtensionLoader.getExtensionLoader(FailStoreFactory.class).getAdaptiveExtension(); failStore = failStoreFactory.getFailStore(application.getConfig(), storePath); } + public RetryScheduler(Application application, String storePath, int batchSize) { this(application, storePath); this.batchSize = batchSize; @@ -57,15 +60,19 @@ protected RetryScheduler(Application application, int batchSize) { this.batchSize = batchSize; } + public void setName(String name) { + this.name = name; + } + public void start() { try { if (start.compareAndSet(false, true)) { // 这个时间后面再去优化 scheduledFuture = RETRY_EXECUTOR_SERVICE.scheduleWithFixedDelay(new CheckRunner(), 10, 30, TimeUnit.SECONDS); - LOGGER.error("Start retry scheduler success!"); + LOGGER.info("Start {} retry scheduler success!", name); } } catch (Throwable t) { - LOGGER.error("Start retry scheduler failed!", t); + LOGGER.error("Start {} retry scheduler failed!", name, t); } } @@ -74,10 +81,10 @@ public void stop() { if (start.compareAndSet(false, true)) { scheduledFuture.cancel(true); RETRY_EXECUTOR_SERVICE.shutdown(); - LOGGER.error("Stop retry scheduler success!"); + LOGGER.info("Stop {} retry scheduler success!", name); } } catch (Throwable t) { - LOGGER.error("Stop retry scheduler failed!", t); + LOGGER.error("Stop {} retry scheduler failed!", name, t); } } @@ -117,7 +124,7 @@ public void run() { values.add(kvPair.getValue()); } if (retry(values)) { - LOGGER.info("本地数据发送成功, {}", JSONUtils.toJSONString(values)); + LOGGER.info("{} local files send success, {}", name, JSONUtils.toJSONString(values)); failStore.delete(keys); } else { break; @@ -137,7 +144,7 @@ public void run() { } while (CollectionUtils.isNotEmpty(kvPairs)); } catch (Throwable e) { - LOGGER.error(e.getMessage(), e); + LOGGER.error("Run {} retry scheduler error.", name, e); } } @@ -152,7 +159,7 @@ public void inSchedule(String key, T value) { failStore.close(); } } catch (FailStoreException e) { - LOGGER.error(e.getMessage(), e); + LOGGER.error("{} in schedule error. ", e); } } diff --git a/lts-jobclient/src/main/java/com/lts/jobclient/RetryJobClient.java b/lts-jobclient/src/main/java/com/lts/jobclient/RetryJobClient.java index 4d3039200..265f310b0 100644 --- a/lts-jobclient/src/main/java/com/lts/jobclient/RetryJobClient.java +++ b/lts-jobclient/src/main/java/com/lts/jobclient/RetryJobClient.java @@ -40,6 +40,7 @@ protected boolean retry(List jobs) { return false; } }; + retryScheduler.setName(RetryJobClient.class.getSimpleName()); super.innerStart(); retryScheduler.start(); } diff --git a/lts-tasktracker/src/main/java/com/lts/tasktracker/logger/BizLoggerImpl.java b/lts-tasktracker/src/main/java/com/lts/tasktracker/logger/BizLoggerImpl.java index 8e2ccc350..34b37cb73 100644 --- a/lts-tasktracker/src/main/java/com/lts/tasktracker/logger/BizLoggerImpl.java +++ b/lts-tasktracker/src/main/java/com/lts/tasktracker/logger/BizLoggerImpl.java @@ -51,6 +51,7 @@ protected boolean retry(List list) { return sendBizLog(list); } }; + retryScheduler.setName(BizLogger.class.getSimpleName()); this.retryScheduler.start(); } diff --git a/lts-tasktracker/src/main/java/com/lts/tasktracker/processor/JobPushProcessor.java b/lts-tasktracker/src/main/java/com/lts/tasktracker/processor/JobPushProcessor.java index 617821bf0..e8e3e5633 100644 --- a/lts-tasktracker/src/main/java/com/lts/tasktracker/processor/JobPushProcessor.java +++ b/lts-tasktracker/src/main/java/com/lts/tasktracker/processor/JobPushProcessor.java @@ -51,7 +51,7 @@ protected boolean retry(List jobResults) { return retrySendJobResults(jobResults); } }; - + retryScheduler.setName("JobPush"); retryScheduler.start(); // 线程安全的