Skip to content

Commit d9e1621

Browse files
authored
Merge pull request #35 from andrewshan/andr-conflict-resolve
fix the log flush issue
2 parents e2e9a7d + 195891d commit d9e1621

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

polaris-dependencies/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -269,6 +269,13 @@
269269
<artifactId>polaris-test-mock-discovery</artifactId>
270270
<version>${project.version}</version>
271271
</dependency>
272+
273+
<!-- shade -->
274+
<dependency>
275+
<groupId>com.tencent.polaris</groupId>
276+
<artifactId>polaris-all</artifactId>
277+
<version>${project.version}</version>
278+
</dependency>
272279
</dependencies>
273280
</dependencyManagement>
274281
</project>

polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/GrpcConnector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ private void submitServiceHandler(ServiceUpdateTask updateTask, long delayMs) {
163163
LOG.info("[ServerConnector]task for service {} has been scheduled builtin", updateTask);
164164
buildInExecutor.schedule(updateTask, delayMs, TimeUnit.MILLISECONDS);
165165
} else {
166-
LOG.info("[ServerConnector]task for service {} has been scheduled discover", updateTask);
166+
LOG.debug("[ServerConnector]task for service {} has been scheduled discover", updateTask);
167167
sendDiscoverExecutor.schedule(updateTask, delayMs, TimeUnit.MILLISECONDS);
168168
}
169169
}

polaris-plugins/polaris-plugins-connector/connector-polaris-grpc/src/main/java/com/tencent/polaris/plugins/connector/grpc/ServiceUpdateTask.java

+2
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ public void addUpdateTaskSet() {
185185
if (taskType.compareAndSet(Type.FIRST, Type.LONG_RUNNING)) {
186186
targetClusterType.set(ClusterType.SERVICE_DISCOVER_CLUSTER);
187187
grpcConnector.addLongRunningTask(this);
188+
LOG.info("[ServerConnector]task for service {} has been scheduled updated", this);
188189
}
189190
}
190191

@@ -199,6 +200,7 @@ public boolean needUpdate() {
199200
}
200201
long nowMs = System.currentTimeMillis();
201202
return nowMs - lastUpdateTime.get() >= refreshIntervalMs;
203+
202204
}
203205

204206
@Override

0 commit comments

Comments
 (0)