code cleanup and adjust logging

bifromqio · Aug 8, 2024 · daecdb6 · daecdb6
1 parent 70f4d0d
commit daecdb6
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 16 deletions.
diff --git a/base-rpc/src/main/java/com/baidu/bifromq/baserpc/RPCServer.java b/base-rpc/src/main/java/com/baidu/bifromq/baserpc/RPCServer.java
@@ -176,7 +176,7 @@ public final void start() {
                 inProcServer.start();
                 interProcServer.start();
                 serverRegisters.forEach((serviceName, serverRegister) -> {
-                    log.info("Start server register for service: {}", serviceName);
+                    log.debug("Start server register for service: {}", serviceName);
                     serverRegister.start(id, (InetSocketAddress) interProcServer.getListenSockets().get(0), emptySet(),
                         serviceMetadata.get(serviceName));
                 });

diff --git a/...rpc/src/main/java/com/baidu/bifromq/baserpc/nameresolver/TrafficGovernorNameResolver.java b/...rpc/src/main/java/com/baidu/bifromq/baserpc/nameresolver/TrafficGovernorNameResolver.java
@@ -48,7 +48,7 @@ public String getServiceAuthority() {
 
     @Override
     public void start(Listener listener) {
-        log.info("Starting TrafficGovernorNameResolver for service[{}]", serviceUniqueName);
+        log.debug("Starting TrafficGovernorNameResolver for service[{}]", serviceUniqueName);
         disposable.add(Observable.combineLatest(trafficDirector.trafficDirective(),
                 trafficDirector.serverList(), (td, sl) -> {
                     log.debug("Service[{}] landscape update:td={}, sl={}", serviceUniqueName, td, sl);
@@ -59,7 +59,7 @@ public void start(Listener listener) {
 
     @Override
     public void shutdown() {
-        log.info("Start to shutdown trafficGovernor nameResolver, service={}", serviceUniqueName);
+        log.debug("Shutting down trafficGovernor nameResolver, service={}", serviceUniqueName);
         disposable.dispose();
         trafficDirector.destroy();
     }

diff --git a/...t/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/AbstractDistWorker.java b/...t/bifromq-dist-worker/src/main/java/com/baidu/bifromq/dist/worker/AbstractDistWorker.java
@@ -80,7 +80,7 @@ public void start() {
 
     public void stop() {
         if (status.compareAndSet(Status.STARTED, Status.STOPPING)) {
-            log.info("Stopping dist worker");
+            log.info("Stopping DistWorker");
             jobRunner.awaitDone();
             rangeBalanceController.stop();
             storeServer().stop();
@@ -90,7 +90,7 @@ public void stop() {
                 log.debug("Stopping Job Executor");
                 MoreExecutors.shutdownAndAwaitTermination(jobScheduler, 5, TimeUnit.SECONDS);
             }
-            log.info("Dist worker stopped");
+            log.info("DistWorker stopped");
             status.compareAndSet(Status.STOPPING, Status.STOPPED);
         }
     }

diff --git a/...inbox-server/src/main/java/com/baidu/bifromq/inbox/server/AbstractInboxServerBuilder.java b/...inbox-server/src/main/java/com/baidu/bifromq/inbox/server/AbstractInboxServerBuilder.java
@@ -30,7 +30,6 @@ abstract class AbstractInboxServerBuilder<T extends AbstractInboxServerBuilder<T
     IDistClient distClient;
     IRetainClient retainClient;
     IBaseKVStoreClient inboxStoreClient;
-    ScheduledExecutorService bgTaskExecutor;
 
     AbstractInboxServerBuilder() {
     }
@@ -71,11 +70,6 @@ public T inboxStoreClient(IBaseKVStoreClient inboxStoreClient) {
         return thisT();
     }
 
-    public T bgTaskExecutor(ScheduledExecutorService bgTaskExecutor) {
-        this.bgTaskExecutor = bgTaskExecutor;
-        return thisT();
-    }
-
     @SuppressWarnings("unchecked")
     private T thisT() {
         return (T) this;

diff --git a/...x/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/AbstractInboxStore.java b/...x/bifromq-inbox-store/src/main/java/com/baidu/bifromq/inbox/store/AbstractInboxStore.java
@@ -99,7 +99,7 @@ public void start() {
 
     public void stop() {
         if (status.compareAndSet(Status.STARTED, Status.STOPPING)) {
-            log.info("Shutting down inbox store");
+            log.info("Stopping InboxStore");
             jobRunner.awaitDone();
             if (gcJob != null && !gcJob.isDone()) {
                 gcJob.join();
@@ -112,7 +112,7 @@ public void stop() {
                 log.debug("Shutting down job executor");
                 MoreExecutors.shutdownAndAwaitTermination(jobScheduler, 5, TimeUnit.SECONDS);
             }
-            log.info("Inbox store shutdown");
+            log.info("InboxStore stopped");
             status.compareAndSet(Status.STOPPING, Status.STOPPED);
         }
     }

diff --git a/...ifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/AbstractRetainStore.java b/...ifromq-retain-store/src/main/java/com/baidu/bifromq/retain/store/AbstractRetainStore.java
@@ -96,7 +96,7 @@ public void start() {
 
     public void stop() {
         if (status.compareAndSet(Status.STARTED, Status.STOPPING)) {
-            log.info("Stopping retain store");
+            log.info("Stopping RetainStore");
             jobRunner.awaitDone();
             if (gcJob != null && !gcJob.isDone()) {
                 gcJob.join();
@@ -107,7 +107,7 @@ public void stop() {
                 log.debug("Shutting down job executor");
                 MoreExecutors.shutdownAndAwaitTermination(jobScheduler, 5, TimeUnit.SECONDS);
             }
-            log.info("Retain store shutdown");
+            log.info("RetainStore shutdown");
             status.compareAndSet(Status.STOPPING, Status.STOPPED);
         }
     }

diff --git a/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/StandaloneStarter.java b/build/build-bifromq-starters/src/main/java/com/baidu/bifromq/starter/StandaloneStarter.java
@@ -346,7 +346,6 @@ protected void init(StandaloneConfig config) {
             .distClient(distClient)
             .retainClient(retainClient)
             .inboxStoreClient(inboxStoreClient)
-            .bgTaskExecutor(bgTaskExecutor)
             .build();
         distWorkerClient = IBaseKVStoreClient.newBuilder()
             .clusterId(IDistWorker.CLUSTER_NAME)