fix: register a destroy hook when the application event trigger

if we register a destroy hook for RemoteConfigFileRepo on the class instance , the static thread pool may be terminated by the bootstrap context closing ,Therefore,it's better to register the destroy hook when the  application is prepared, or when the application fails to start, in order to properly destroy resources
pull/1102/head
shuiqingliu 2 years ago
parent 97d9eb89ed
commit aa1f4a7785

@ -28,13 +28,11 @@ import com.tencent.cloud.polaris.config.annotation.PolarisConfigAnnotationProces
import com.tencent.cloud.polaris.config.condition.ConditionalOnReflectRefreshType; import com.tencent.cloud.polaris.config.condition.ConditionalOnReflectRefreshType;
import com.tencent.cloud.polaris.config.config.PolarisConfigProperties; import com.tencent.cloud.polaris.config.config.PolarisConfigProperties;
import com.tencent.cloud.polaris.config.listener.PolarisConfigChangeEventListener; import com.tencent.cloud.polaris.config.listener.PolarisConfigChangeEventListener;
import com.tencent.cloud.polaris.config.listener.PolarisConfigNonDaemonThreadStopListener;
import com.tencent.cloud.polaris.config.listener.PolarisConfigRefreshOptimizationListener; import com.tencent.cloud.polaris.config.listener.PolarisConfigRefreshOptimizationListener;
import com.tencent.cloud.polaris.config.logger.PolarisConfigLoggerApplicationListener; import com.tencent.cloud.polaris.config.logger.PolarisConfigLoggerApplicationListener;
import com.tencent.cloud.polaris.config.spring.annotation.SpringValueProcessor; import com.tencent.cloud.polaris.config.spring.annotation.SpringValueProcessor;
import com.tencent.cloud.polaris.config.spring.property.PlaceholderHelper; import com.tencent.cloud.polaris.config.spring.property.PlaceholderHelper;
import com.tencent.cloud.polaris.config.spring.property.SpringValueRegistry; import com.tencent.cloud.polaris.config.spring.property.SpringValueRegistry;
import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
import org.springframework.boot.autoconfigure.AutoConfigureBefore; import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@ -65,11 +63,6 @@ public class PolarisConfigAutoConfiguration {
return new PolarisConfigChangeEventListener(); return new PolarisConfigChangeEventListener();
} }
@Bean
public PolarisConfigNonDaemonThreadStopListener polarisLongPullingStopListener(PolarisSDKContextManager polarisSDKContextManager) {
return new PolarisConfigNonDaemonThreadStopListener(polarisSDKContextManager);
}
@Bean @Bean
public PolarisConfigLoggerApplicationListener polarisConfigLoggerApplicationListener() { public PolarisConfigLoggerApplicationListener polarisConfigLoggerApplicationListener() {
return new PolarisConfigLoggerApplicationListener(); return new PolarisConfigLoggerApplicationListener();

@ -25,6 +25,7 @@ import com.tencent.cloud.polaris.context.ModifyAddress;
import com.tencent.cloud.polaris.context.PolarisConfigModifier; import com.tencent.cloud.polaris.context.PolarisConfigModifier;
import com.tencent.cloud.polaris.context.PolarisSDKContextManager; import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
import com.tencent.cloud.polaris.context.ServiceRuleManager; import com.tencent.cloud.polaris.context.ServiceRuleManager;
import com.tencent.cloud.polaris.context.listener.PolarisContextApplicationEventListener;
import com.tencent.polaris.api.exception.PolarisException; import com.tencent.polaris.api.exception.PolarisException;
import com.tencent.polaris.client.api.SDKContext; import com.tencent.polaris.client.api.SDKContext;
@ -58,4 +59,9 @@ public class PolarisContextAutoConfiguration {
public ServiceRuleManager serviceRuleManager(PolarisSDKContextManager polarisSDKContextManager) { public ServiceRuleManager serviceRuleManager(PolarisSDKContextManager polarisSDKContextManager) {
return new ServiceRuleManager(polarisSDKContextManager.getSDKContext(), polarisSDKContextManager.getConsumerAPI()); return new ServiceRuleManager(polarisSDKContextManager.getSDKContext(), polarisSDKContextManager.getConsumerAPI());
} }
@Bean
public PolarisContextApplicationEventListener polarisContextApplicationEventListener(PolarisSDKContextManager polarisSDKContextManager) {
return new PolarisContextApplicationEventListener(polarisSDKContextManager);
}
} }

@ -16,11 +16,13 @@
* *
*/ */
package com.tencent.cloud.polaris.config.listener; package com.tencent.cloud.polaris.context.listener;
import com.tencent.cloud.polaris.context.PolarisSDKContextManager; import com.tencent.cloud.polaris.context.PolarisSDKContextManager;
import com.tencent.polaris.configuration.client.internal.RemoteConfigFileRepo;
import org.springframework.boot.context.event.ApplicationFailedEvent; import org.springframework.boot.context.event.ApplicationFailedEvent;
import org.springframework.boot.context.event.ApplicationPreparedEvent;
import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEvent;
import org.springframework.context.ApplicationListener; import org.springframework.context.ApplicationListener;
import org.springframework.lang.NonNull; import org.springframework.lang.NonNull;
@ -31,17 +33,22 @@ import org.springframework.lang.NonNull;
* @author shuiqingliu * @author shuiqingliu
* @since 2023/8/29 * @since 2023/8/29
**/ **/
public class PolarisConfigNonDaemonThreadStopListener implements ApplicationListener<ApplicationEvent> { public class PolarisContextApplicationEventListener implements ApplicationListener<ApplicationEvent> {
private final PolarisSDKContextManager polarisSDKContextManager; private final PolarisSDKContextManager polarisSDKContextManager;
public PolarisConfigNonDaemonThreadStopListener(PolarisSDKContextManager polarisSDKContextManager) { public PolarisContextApplicationEventListener(PolarisSDKContextManager polarisSDKContextManager) {
this.polarisSDKContextManager = polarisSDKContextManager; this.polarisSDKContextManager = polarisSDKContextManager;
} }
@Override @Override
public void onApplicationEvent(@NonNull ApplicationEvent event) { public void onApplicationEvent(@NonNull ApplicationEvent event) {
if (event instanceof ApplicationPreparedEvent) {
RemoteConfigFileRepo.registerRepoDestroyHook(polarisSDKContextManager.getSDKContext());
}
if (event instanceof ApplicationFailedEvent) { if (event instanceof ApplicationFailedEvent) {
RemoteConfigFileRepo.registerRepoDestroyHook(polarisSDKContextManager.getSDKContext());
//implicit invoke 'destroy' when the spring application fails to start, in order to stop non-daemon threads. //implicit invoke 'destroy' when the spring application fails to start, in order to stop non-daemon threads.
polarisSDKContextManager.getSDKContext().destroy(); polarisSDKContextManager.getSDKContext().destroy();
} }
Loading…
Cancel
Save