Skip to content

feat:reform the start listener to extend #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caojie09 merged 1 commit into from
Nov 28, 2019
Merged

feat:reform the start listener to extend #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions ...figure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/SofaRpcAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,8 @@ public ApplicationContextRefreshedListener applicationContextRefreshedListener()

@Bean
@ConditionalOnMissingBean
public SofaBootRpcStartListener sofaBootRpcStartListener(ProviderConfigContainer providerConfigContainer,
FaultToleranceConfigurator faultToleranceConfigurator,
ServerConfigContainer serverConfigContainer,
RegistryConfigContainer registryConfigContainer) {
return new SofaBootRpcStartListener(providerConfigContainer, faultToleranceConfigurator,
serverConfigContainer, registryConfigContainer);
public SofaBootRpcStartListener sofaBootRpcStartListener() {
return new SofaBootRpcStartListener();
}

@Bean
Expand Down
50 changes: 28 additions & 22 deletions ...pc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/context/SofaBootRpcStartListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,6 @@
*/
package com.alipay.sofa.rpc.boot.context;

import java.util.Collection;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
import org.springframework.util.CollectionUtils;

import com.alipay.sofa.rpc.boot.common.SofaBootRpcParserUtil;
import com.alipay.sofa.rpc.boot.config.FaultToleranceConfigurator;
import com.alipay.sofa.rpc.boot.config.SofaBootRpcProperties;
Expand All @@ -31,6 +25,11 @@
import com.alipay.sofa.rpc.boot.context.event.SofaBootRpcStartEvent;
import com.alipay.sofa.rpc.config.ProviderConfig;
import com.alipay.sofa.rpc.event.LookoutSubscriber;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationListener;
import org.springframework.util.CollectionUtils;

import java.util.Collection;

/**
* {@link SofaBootRpcStartEvent} 事件监听器.
Expand All @@ -42,28 +41,31 @@
public class SofaBootRpcStartListener implements ApplicationListener<SofaBootRpcStartEvent> {

@Autowired
private SofaBootRpcProperties sofaBootRpcProperties;

private final ProviderConfigContainer providerConfigContainer;
private final FaultToleranceConfigurator faultToleranceConfigurator;
private final ServerConfigContainer serverConfigContainer;
private final RegistryConfigContainer registryConfigContainer;

public SofaBootRpcStartListener(ProviderConfigContainer providerConfigContainer,
FaultToleranceConfigurator faultToleranceConfigurator,
ServerConfigContainer serverConfigContainer,
RegistryConfigContainer registryConfigContainer) {
this.providerConfigContainer = providerConfigContainer;
this.faultToleranceConfigurator = faultToleranceConfigurator;
this.serverConfigContainer = serverConfigContainer;
this.registryConfigContainer = registryConfigContainer;
private SofaBootRpcProperties sofaBootRpcProperties;

@Autowired
protected ProviderConfigContainer providerConfigContainer;

@Autowired
protected FaultToleranceConfigurator faultToleranceConfigurator;

@Autowired
protected ServerConfigContainer serverConfigContainer;

@Autowired
protected RegistryConfigContainer registryConfigContainer;

public SofaBootRpcStartListener() {
}

@Override
public void onApplicationEvent(SofaBootRpcStartEvent event) {
//choose disable metrics lookout
disableLookout();

//extra info
processExtra(event);

//start fault tolerance
faultToleranceConfigurator.startFaultTolerance();

Expand All @@ -84,7 +86,11 @@ public void onApplicationEvent(SofaBootRpcStartEvent event) {
providerConfigContainer.exportAllDubboProvideConfig();
}

private void disableLookout() {
protected void processExtra(SofaBootRpcStartEvent event) {

}

protected void disableLookout() {
Boolean disable = SofaBootRpcParserUtil.parseBoolean(sofaBootRpcProperties
.getLookoutCollectDisable());

Expand Down
37 changes: 16 additions & 21 deletions ...c-sofa-boot/src/test/java/com/alipay/sofa/rpc/boot/test/SofaRpcTestAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,6 @@
*/
package com.alipay.sofa.rpc.boot.test;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Lazy;

import com.alipay.sofa.healthcheck.startup.ReadinessCheckCallback;
import com.alipay.sofa.rpc.boot.config.ConsulConfigurator;
import com.alipay.sofa.rpc.boot.config.FaultToleranceConfigurator;
Expand All @@ -53,6 +38,20 @@
import com.alipay.sofa.rpc.boot.runtime.adapter.helper.ConsumerConfigHelper;
import com.alipay.sofa.rpc.boot.runtime.adapter.helper.ProviderConfigHelper;
import com.alipay.sofa.rpc.boot.swagger.SwaggerServiceApplicationListener;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.context.annotation.Lazy;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

/**
* @author qilong.zql
Expand Down Expand Up @@ -153,12 +152,8 @@ public ApplicationContextRefreshedListener applicationContextRefreshedListener()
}

@Bean
public SofaBootRpcStartListener sofaBootRpcStartListener(ProviderConfigContainer providerConfigContainer,
FaultToleranceConfigurator faultToleranceConfigurator,
ServerConfigContainer serverConfigContainer,
RegistryConfigContainer registryConfigContainer) {
return new SofaBootRpcStartListener(providerConfigContainer, faultToleranceConfigurator,
serverConfigContainer, registryConfigContainer);
public SofaBootRpcStartListener sofaBootRpcStartListener() {
return new SofaBootRpcStartListener();
}

@Bean
Expand Down