This is an automated email from the ASF dual-hosted git repository. zhanglei pushed a commit to branch SCB-1321 in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
commit a92bcc5a43debb10aef4e0c9b96e58246fba03aa Author: Lei Zhang <[email protected]> AuthorDate: Mon Jul 8 20:01:17 2019 +0800 SCB-1321 Rename akka enabled parameter alpha.model.actor.enabled to alpha.feature.akka.enabled --- .../org/apache/servicecomb/pack/alpha/server/AlphaConfig.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaConfig.java b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaConfig.java index 221bfe5..e6fa86a 100644 --- a/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaConfig.java +++ b/alpha/alpha-server/src/main/java/org/apache/servicecomb/pack/alpha/server/AlphaConfig.java @@ -148,7 +148,7 @@ public class AlphaConfig { } @Bean - @ConditionalOnProperty(name = "alpha.model.actor.enabled", havingValue = "false", matchIfMissing = true) + @ConditionalOnProperty(name = "alpha.feature.akka.enabled", havingValue = "false", matchIfMissing = true) ServerStartable serverStartable(GrpcServerConfig serverConfig, TxConsistentService txConsistentService, Map<String, Map<String, OmegaCallback>> omegaCallbacks, GrpcTccEventService grpcTccEventService, TccPendingTaskRunner tccPendingTaskRunner, TccEventScanner tccEventScanner, @Qualifier("alphaEventBus") EventBus eventBus) throws IOException { @@ -161,12 +161,12 @@ public class AlphaConfig { tccPendingTaskRunner.shutdown(); tccEventScanner.shutdown(); })); - + LOG.info("alpha.feature.akka.enabled=false"); return bootstrap; } @Bean - @ConditionalOnProperty(name= "alpha.model.actor.enabled", havingValue = "true") + @ConditionalOnProperty(name= "alpha.feature.akka.enabled", havingValue = "true") ServerStartable serverStartableMy(GrpcServerConfig serverConfig, Map<String, Map<String, OmegaCallback>> omegaCallbacks, GrpcTccEventService grpcTccEventService, TccPendingTaskRunner tccPendingTaskRunner, TccEventScanner tccEventScanner, @Qualifier("alphaEventBus") EventBus eventBus, @Qualifier("sagaEventBus") EventBus sagaEventBus) throws IOException { @@ -179,7 +179,7 @@ public class AlphaConfig { tccPendingTaskRunner.shutdown(); tccEventScanner.shutdown(); })); - + LOG.info("alpha.feature.akka.enabled=true"); return bootstrap; }
