Skip to content

Commit 2190052

Browse files
committed
Upgrade rpc all version to 5.13.2
Signed-off-by: JermaineHua <[email protected]>
1 parent cf9de07 commit 2190052

File tree

3 files changed

+4
-24
lines changed

3 files changed

+4
-24
lines changed

sofa-boot-project/sofa-boot-autoconfigure/src/main/java/com/alipay/sofa/boot/autoconfigure/rpc/SofaRpcAutoConfiguration.java

+3-5
Original file line numberDiff line numberDiff line change
@@ -271,11 +271,9 @@ public SofaBootRpcStartListener sofaBootRpcStartListener(SofaBootRpcProperties s
271271
ObjectProvider<FaultToleranceConfigurator> faultToleranceConfigurator,
272272
ServerConfigContainer serverConfigContainer,
273273
RegistryConfigContainer registryConfigContainer) {
274-
SofaBootRpcStartListener rpcStartListener = new SofaBootRpcStartListener(
275-
providerConfigContainer, faultToleranceConfigurator.getIfUnique(),
276-
serverConfigContainer, registryConfigContainer);
277-
rpcStartListener.setLookoutCollectDisable(sofaBootRpcProperties.getLookoutCollectDisable());
278-
return rpcStartListener;
274+
return new SofaBootRpcStartListener(providerConfigContainer,
275+
faultToleranceConfigurator.getIfUnique(), serverConfigContainer,
276+
registryConfigContainer);
279277
}
280278

281279
@Bean

sofa-boot-project/sofa-boot-core/rpc-sofa-boot/src/main/java/com/alipay/sofa/rpc/boot/context/SofaBootRpcStartListener.java

-18
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,12 @@
1616
*/
1717
package com.alipay.sofa.rpc.boot.context;
1818

19-
import com.alipay.sofa.rpc.boot.common.SofaBootRpcParserUtil;
2019
import com.alipay.sofa.rpc.boot.config.FaultToleranceConfigurator;
2120
import com.alipay.sofa.rpc.boot.container.ProviderConfigContainer;
2221
import com.alipay.sofa.rpc.boot.container.RegistryConfigContainer;
2322
import com.alipay.sofa.rpc.boot.container.ServerConfigContainer;
2423
import com.alipay.sofa.rpc.boot.context.event.SofaBootRpcStartEvent;
2524
import com.alipay.sofa.rpc.config.ProviderConfig;
26-
import com.alipay.sofa.rpc.event.LookoutSubscriber;
2725
import org.springframework.context.ApplicationListener;
2826
import org.springframework.util.CollectionUtils;
2927

@@ -46,8 +44,6 @@ public class SofaBootRpcStartListener implements ApplicationListener<SofaBootRpc
4644

4745
protected final RegistryConfigContainer registryConfigContainer;
4846

49-
private String lookoutCollectDisable;
50-
5147
public SofaBootRpcStartListener(ProviderConfigContainer providerConfigContainer,
5248
FaultToleranceConfigurator faultToleranceConfigurator,
5349
ServerConfigContainer serverConfigContainer,
@@ -60,8 +56,6 @@ public SofaBootRpcStartListener(ProviderConfigContainer providerConfigContainer,
6056

6157
@Override
6258
public void onApplicationEvent(SofaBootRpcStartEvent event) {
63-
//choose disable metrics lookout
64-
disableLookout();
6559

6660
//extra info
6761
processExtra(event);
@@ -91,16 +85,4 @@ public void onApplicationEvent(SofaBootRpcStartEvent event) {
9185
protected void processExtra(SofaBootRpcStartEvent event) {
9286

9387
}
94-
95-
protected void disableLookout() {
96-
Boolean disable = SofaBootRpcParserUtil.parseBoolean(lookoutCollectDisable);
97-
98-
if (disable != null) {
99-
LookoutSubscriber.setLookoutCollectDisable(disable);
100-
}
101-
}
102-
103-
public void setLookoutCollectDisable(String lookoutCollectDisable) {
104-
this.lookoutCollectDisable = lookoutCollectDisable;
105-
}
10688
}

sofa-boot-project/sofaboot-dependencies/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<!-- sofa stack lib-->
2525
<sofa.registry.version>6.1.8</sofa.registry.version>
2626
<tracer.core.version>4.0.1</tracer.core.version>
27-
<rpc.core.version>5.13.0</rpc.core.version>
27+
<rpc.core.version>5.13.2</rpc.core.version>
2828
<sofa.common.tools.version>2.1.1</sofa.common.tools.version>
2929
<sofa.bolt.version>1.6.10</sofa.bolt.version>
3030
<sofa.hessian.version>3.5.5</sofa.hessian.version>

0 commit comments

Comments
 (0)