fix: change the timing of sdk context destruction. (#1124)

pull/1142/head
qingliu 1 year ago committed by GitHub
parent 0db7b3b4b5
commit 7e7c5dfb7e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -27,14 +27,12 @@ import com.tencent.cloud.polaris.config.adapter.PolarisRefreshEntireContextRefre
import com.tencent.cloud.polaris.config.annotation.PolarisConfigAnnotationProcessor; import com.tencent.cloud.polaris.config.annotation.PolarisConfigAnnotationProcessor;
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.PolarisConfigApplicationEventListener;
import com.tencent.cloud.polaris.config.listener.PolarisConfigChangeEventListener; import com.tencent.cloud.polaris.config.listener.PolarisConfigChangeEventListener;
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;
@ -122,10 +120,5 @@ public class PolarisConfigAutoConfiguration {
public PolarisConfigRefreshOptimizationListener polarisConfigRefreshOptimizationListener() { public PolarisConfigRefreshOptimizationListener polarisConfigRefreshOptimizationListener() {
return new PolarisConfigRefreshOptimizationListener(); return new PolarisConfigRefreshOptimizationListener();
} }
@Bean
public PolarisConfigApplicationEventListener polarisContextApplicationEventListener(PolarisSDKContextManager polarisSDKContextManager) {
return new PolarisConfigApplicationEventListener(polarisSDKContextManager);
}
} }
} }

@ -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 contextApplicationEventListener(PolarisSDKContextManager polarisSDKContextManager) {
return new PolarisContextApplicationEventListener(polarisSDKContextManager);
}
} }

@ -16,42 +16,33 @@
* *
*/ */
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;
/* /**
* Polaris config non-daemon thread stop listener * @author frankjlli
* * @since 2023/9/18
* @author shuiqingliu
* @since 2023/8/29
**/ **/
public class PolarisConfigApplicationEventListener implements ApplicationListener<ApplicationEvent> {
public class PolarisContextApplicationEventListener implements ApplicationListener<ApplicationEvent> {
private final PolarisSDKContextManager polarisSDKContextManager; private final PolarisSDKContextManager polarisSDKContextManager;
public PolarisConfigApplicationEventListener(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