Merge pull request #35 from andrewshan/andr-conflict-resolve

fix the log flush issue
polarismesh · Dec 14, 2021 · d9e1621 · d9e1621
2 parents e2e9a7d + 195891d
commit d9e1621
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/polaris-dependencies/pom.xml b/polaris-dependencies/pom.xml
@@ -269,6 +269,13 @@
                 <artifactId>polaris-test-mock-discovery</artifactId>
                 <version>${project.version}</version>
             </dependency>
+
+            <!-- shade -->
+            <dependency>
+                <groupId>com.tencent.polaris</groupId>
+                <artifactId>polaris-all</artifactId>
+                <version>${project.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/...-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java b/...-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java
@@ -163,7 +163,7 @@ private void submitServiceHandler(ServiceUpdateTask updateTask, long delayMs) {
                 LOG.info("[ServerConnector]task for service {} has been scheduled builtin", updateTask);
                 buildInExecutor.schedule(updateTask, delayMs, TimeUnit.MILLISECONDS);
             } else {
-                LOG.info("[ServerConnector]task for service {} has been scheduled discover", updateTask);
+                LOG.debug("[ServerConnector]task for service {} has been scheduled discover", updateTask);
                 sendDiscoverExecutor.schedule(updateTask, delayMs, TimeUnit.MILLISECONDS);
             }
         }

diff --git a/...aris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/ServiceUpdateTask.java b/...aris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/ServiceUpdateTask.java
@@ -185,6 +185,7 @@ public void addUpdateTaskSet() {
         if (taskType.compareAndSet(Type.FIRST, Type.LONG_RUNNING)) {
             targetClusterType.set(ClusterType.SERVICE_DISCOVER_CLUSTER);
             grpcConnector.addLongRunningTask(this);
+            LOG.info("[ServerConnector]task for service {} has been scheduled updated", this);
         }
     }
 
@@ -199,6 +200,7 @@ public boolean needUpdate() {
         }
         long nowMs = System.currentTimeMillis();
         return nowMs - lastUpdateTime.get() >= refreshIntervalMs;
+
     }
 
     @Override