From d568c4265a4bce01daf2b676c206d0c0cb28b405 Mon Sep 17 00:00:00 2001 From: shedfreewu Date: Fri, 27 Sep 2024 12:46:49 +0800 Subject: [PATCH] fix --- .../serviceregistry/AutoServiceRegistrationUtils.java | 6 +++++- .../logging/PolarisLoggingApplicationListener.java | 10 ++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationUtils.java b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationUtils.java index 1c8e09f91..4c9d481ed 100644 --- a/spring-cloud-starter-tencent-polaris-discovery/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationUtils.java +++ b/spring-cloud-starter-tencent-polaris-discovery/src/test/java/org/springframework/cloud/client/serviceregistry/AutoServiceRegistrationUtils.java @@ -17,7 +17,11 @@ package org.springframework.cloud.client.serviceregistry; -public class AutoServiceRegistrationUtils { +public final class AutoServiceRegistrationUtils { + + private AutoServiceRegistrationUtils() { + + } public static void register(AbstractAutoServiceRegistration autoServiceRegistration) { autoServiceRegistration.register(); diff --git a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingApplicationListener.java b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingApplicationListener.java index 67ad30a8b..287779ef2 100644 --- a/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingApplicationListener.java +++ b/spring-cloud-tencent-polaris-context/src/main/java/com/tencent/cloud/polaris/context/logging/PolarisLoggingApplicationListener.java @@ -19,10 +19,13 @@ package com.tencent.cloud.polaris.context.logging; import com.tencent.polaris.api.utils.StringUtils; import com.tencent.polaris.logging.LoggingConsts; import com.tencent.polaris.logging.PolarisLogging; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.logging.LoggingApplicationListener; +import org.springframework.boot.web.context.WebServerInitializedEvent; import org.springframework.cloud.context.environment.EnvironmentChangeEvent; import org.springframework.context.ApplicationEvent; import org.springframework.context.event.GenericApplicationListener; @@ -37,6 +40,8 @@ import org.springframework.lang.NonNull; */ public class PolarisLoggingApplicationListener implements GenericApplicationListener { + private static final Logger LOG = LoggerFactory.getLogger(PolarisLoggingApplicationListener.class); + private static final int ORDER = LoggingApplicationListener.DEFAULT_ORDER + 2; @Override @@ -47,7 +52,8 @@ public class PolarisLoggingApplicationListener implements GenericApplicationList } return ApplicationEnvironmentPreparedEvent.class.isAssignableFrom(type) || ApplicationFailedEvent.class.isAssignableFrom(type) - || EnvironmentChangeEvent.class.isAssignableFrom(type); + || EnvironmentChangeEvent.class.isAssignableFrom(type) + || WebServerInitializedEvent.class.isAssignableFrom(type); } @Override @@ -72,7 +78,7 @@ public class PolarisLoggingApplicationListener implements GenericApplicationList System.setProperty(LoggingConsts.LOGGING_PATH_PROPERTY, loggingPath); } } - + LOG.info("Polaris logging configuration reloaded in {}.", applicationEvent.getClass().getSimpleName()); PolarisLogging.getInstance().loadConfiguration(); } }