Merge pull request #277 from ltsopensource/develop

ConfigurationProperties 支持

Author: qq254963746

lts-core/src/main/java/com/github/ltsopensource/core/support/RetryScheduler.java

@@ -39,8 +39,8 @@ public abstract class RetryScheduler<T> {
     private Class<?> type = GenericsUtils.getSuperClassGenericType(this.getClass());
 
     // 定时检查是否有 师表的反馈任务信息(给客户端的)
-    private ScheduledExecutorService RETRY_EXECUTOR_SERVICE = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("LTS-RetryScheduler-retry", true));
-    private ScheduledExecutorService MASTER_RETRY_EXECUTOR_SERVICE = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("LTS-RetryScheduler-master-retry", true));
+    private ScheduledExecutorService RETRY_EXECUTOR_SERVICE;
+    private ScheduledExecutorService MASTER_RETRY_EXECUTOR_SERVICE;
     private ScheduledFuture<?> masterScheduledFuture;
     private ScheduledFuture<?> scheduledFuture;
     private AtomicBoolean selfCheckStart = new AtomicBoolean(false);
@@ -93,6 +93,7 @@ public RetryScheduler(String name, AppContext appContext, String storePath, int
     public void start() {
         try {
             if (selfCheckStart.compareAndSet(false, true)) {
+                this.RETRY_EXECUTOR_SERVICE = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("LTS-RetryScheduler-retry", true));
                 // 这个时间后面再去优化
                 scheduledFuture = RETRY_EXECUTOR_SERVICE.scheduleWithFixedDelay
                         (new CheckSelfRunner(), 10, 30, TimeUnit.SECONDS);
@@ -106,6 +107,7 @@ public void start() {
     private void startMasterCheck() {
         try {
             if (masterCheckStart.compareAndSet(false, true)) {
+                this.MASTER_RETRY_EXECUTOR_SERVICE = Executors.newSingleThreadScheduledExecutor(new NamedThreadFactory("LTS-RetryScheduler-master-retry", true));
                 // 这个时间后面再去优化
                 masterScheduledFuture = MASTER_RETRY_EXECUTOR_SERVICE.
                         scheduleWithFixedDelay(new CheckDeadFailStoreRunner(), 30, 60, TimeUnit.SECONDS);
@@ -121,7 +123,9 @@ private void stopMasterCheck() {
             if (masterCheckStart.compareAndSet(true, false)) {
                 if (masterScheduledFuture != null) {
                     masterScheduledFuture.cancel(true);
+                    masterScheduledFuture = null;
                     MASTER_RETRY_EXECUTOR_SERVICE.shutdown();
+                    MASTER_RETRY_EXECUTOR_SERVICE = null;
                 }
                 LOGGER.info("Stop {} master RetryScheduler success, identity=[{}]", name, appContext.getConfig().getIdentity());
             }
@@ -135,8 +139,10 @@ public void stop() {
             if (selfCheckStart.compareAndSet(true, false)) {
                 if (scheduledFuture != null) {
                     scheduledFuture.cancel(true);
+                    scheduledFuture = null;
                     failStore.close();
                     RETRY_EXECUTOR_SERVICE.shutdown();
+                    RETRY_EXECUTOR_SERVICE = null;
                 }
                 LOGGER.info("Stop {} RetryScheduler success, identity=[{}]", name, appContext.getConfig().getIdentity());
             }
@@ -155,13 +161,20 @@ public void destroy() {
         }
     }
 
+    private AtomicBoolean checkSelfRunnerStart = new AtomicBoolean(false);
+
     /**
      * 定时检查 提交失败任务的Runnable
      */
     private class CheckSelfRunner implements Runnable {
 
         @Override
         public void run() {
+
+            if (!checkSelfRunnerStart.compareAndSet(false, true)) {
+                return;
+            }
+
             try {
                 // 1. 检测 远程连接 是否可用
                 if (!isRemotingEnable()) {
@@ -200,17 +213,24 @@ public void run() {
 
             } catch (Throwable e) {
                 LOGGER.error("Run {} RetryScheduler error , identity=[{}]", name, appContext.getConfig().getIdentity(), e);
+            } finally {
+                checkSelfRunnerStart.set(false);
             }
         }
     }
 
+    private AtomicBoolean checkDeadFailStoreRunnerStart = new AtomicBoolean(false);
+
     /**
      * 定时检查 已经down掉的机器的FailStore目录
      */
     private class CheckDeadFailStoreRunner implements Runnable {
 
         @Override
         public void run() {
+            if (!checkDeadFailStoreRunnerStart.compareAndSet(false, true)) {
+                return;
+            }
             try {
                 // 1. 检测 远程连接 是否可用
                 if (!isRemotingEnable()) {
@@ -255,6 +275,8 @@ public void run() {
                 }
             } catch (Throwable e) {
                 LOGGER.error("Run {} master RetryScheduler error, identity=[{}] ", name, appContext.getConfig().getIdentity(), e);
+            } finally {
+                checkDeadFailStoreRunnerStart.set(false);
             }
         }
     }

lts-example/src/main/resources/log4j.properties

@@ -1,7 +1,7 @@
 
-log4j.rootLogger=DEBUG,stdout
+log4j.rootLogger=INFO,stdout
 
-log4j.appender.stdout.Threshold=DEBUG
+log4j.appender.stdout.Threshold=INFO
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=[%-5p] [%d{HH:mm:ss}] %c - %m%n