From 801e8c28bf9dc6c6b1ea9079809ce76da142a23f Mon Sep 17 00:00:00 2001 From: Fishtail <49390359+fuyuwei01@users.noreply.github.com> Date: Thu, 18 Dec 2025 15:26:35 +0800 Subject: [PATCH] fix: beautify ServicesEagerLoadSmartLifecycle logging. (#1774) Signed-off-by: Haotian Zhang <928016560@qq.com> --- CHANGELOG.md | 1 + .../eager/config/PolarisEagerLoadAutoConfiguration.java | 4 ++-- .../services/ServicesEagerLoadSmartLifecycle.java | 8 ++------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 233ed106a..1793ab159 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -44,3 +44,4 @@ - [feat: support TagUtils, ContextToHeaderInterceptor in TSF.](https://github.com/Tencent/spring-cloud-tencent/pull/1754) - [fix: send unit header in tsf gw.](https://github.com/Tencent/spring-cloud-tencent/pull/1758) - [feat: add new key for java agent nacos discovery.](https://github.com/Tencent/spring-cloud-tencent/pull/1769) +- [fix: beautify ServicesEagerLoadSmartLifecycle logging.](https://github.com/Tencent/spring-cloud-tencent/pull/1774) diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/eager/config/PolarisEagerLoadAutoConfiguration.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/eager/config/PolarisEagerLoadAutoConfiguration.java index 2b2949dd2..f0a900e29 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/eager/config/PolarisEagerLoadAutoConfiguration.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/eager/config/PolarisEagerLoadAutoConfiguration.java @@ -44,9 +44,9 @@ public class PolarisEagerLoadAutoConfiguration { @Bean @ConditionalOnProperty(name = "spring.cloud.polaris.discovery.eager-load.services.enabled", havingValue = "true", matchIfMissing = true) public ServicesEagerLoadSmartLifecycle serviceEagerLoadSmartLifecycle( - ApplicationContext applicationContext, @Autowired(required = false) PolarisDiscoveryClient polarisDiscoveryClient, + @Autowired(required = false) PolarisDiscoveryClient polarisDiscoveryClient, @Autowired(required = false) PolarisReactiveDiscoveryClient polarisReactiveDiscoveryClient) { - return new ServicesEagerLoadSmartLifecycle(applicationContext, polarisDiscoveryClient, polarisReactiveDiscoveryClient); + return new ServicesEagerLoadSmartLifecycle(polarisDiscoveryClient, polarisReactiveDiscoveryClient); } } diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/eager/instrument/services/ServicesEagerLoadSmartLifecycle.java b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/eager/instrument/services/ServicesEagerLoadSmartLifecycle.java index 175bb76c3..cc71417f5 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/eager/instrument/services/ServicesEagerLoadSmartLifecycle.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/eager/instrument/services/ServicesEagerLoadSmartLifecycle.java @@ -24,22 +24,18 @@ import com.tencent.cloud.polaris.discovery.reactive.PolarisReactiveDiscoveryClie import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.context.ApplicationContext; import org.springframework.context.SmartLifecycle; public class ServicesEagerLoadSmartLifecycle implements SmartLifecycle { private static final Logger LOG = LoggerFactory.getLogger(ServicesEagerLoadSmartLifecycle.class); - private final ApplicationContext applicationContext; - private final PolarisDiscoveryClient polarisDiscoveryClient; private final PolarisReactiveDiscoveryClient polarisReactiveDiscoveryClient; - public ServicesEagerLoadSmartLifecycle(ApplicationContext applicationContext, PolarisDiscoveryClient polarisDiscoveryClient, + public ServicesEagerLoadSmartLifecycle(PolarisDiscoveryClient polarisDiscoveryClient, PolarisReactiveDiscoveryClient polarisReactiveDiscoveryClient) { - this.applicationContext = applicationContext; this.polarisDiscoveryClient = polarisDiscoveryClient; this.polarisReactiveDiscoveryClient = polarisReactiveDiscoveryClient; } @@ -53,7 +49,7 @@ public class ServicesEagerLoadSmartLifecycle implements SmartLifecycle { LOG.info("eager-load got services: {}", servicesList); } else if (polarisReactiveDiscoveryClient != null) { - polarisReactiveDiscoveryClient.getServices().subscribe(services -> { + polarisReactiveDiscoveryClient.getServices().collectList().subscribe(services -> { LOG.info("eager-load got services: {}", services); }); }