This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-saga.git
commit 5b2194a1e68bcd8a5c0b03b5c112fac327d1ffce Author: seanyinx <[email protected]> AuthorDate: Tue Dec 26 11:00:58 2017 +0800 SCB-97 made alpha server port configurable with default 8080 Signed-off-by: seanyinx <[email protected]> --- .../src/main/java/io/servicecomb/saga/alpha/server/AlphaConfig.java | 5 +++-- .../java/io/servicecomb/saga/alpha/server/AlphaIntegrationTest.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/AlphaConfig.java b/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/AlphaConfig.java index 259f1cb..50d4a8d 100644 --- a/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/AlphaConfig.java +++ b/alpha/alpha-server/src/main/java/io/servicecomb/saga/alpha/server/AlphaConfig.java @@ -19,6 +19,7 @@ package io.servicecomb.saga.alpha.server; import java.util.concurrent.CompletableFuture; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -28,10 +29,10 @@ import io.servicecomb.saga.alpha.core.TxEventRepository; class AlphaConfig { @Bean - TxEventRepository springTxEventRepository(TxEventEnvelopeRepository eventRepo) { + TxEventRepository springTxEventRepository(@Value("${alpha.server.port:8080}") int port, TxEventEnvelopeRepository eventRepo) { TxEventRepository eventRepository = new SpringTxEventRepository(eventRepo); - ThriftStartable startable = new ThriftStartable(8090, new SwiftTxEventEndpointImpl(eventRepository)); + ThriftStartable startable = new ThriftStartable(port, new SwiftTxEventEndpointImpl(eventRepository)); CompletableFuture.runAsync(startable::start); return eventRepository; diff --git a/alpha/alpha-server/src/test/java/io/servicecomb/saga/alpha/server/AlphaIntegrationTest.java b/alpha/alpha-server/src/test/java/io/servicecomb/saga/alpha/server/AlphaIntegrationTest.java index 8578bf3..1e1ce99 100644 --- a/alpha/alpha-server/src/test/java/io/servicecomb/saga/alpha/server/AlphaIntegrationTest.java +++ b/alpha/alpha-server/src/test/java/io/servicecomb/saga/alpha/server/AlphaIntegrationTest.java @@ -37,7 +37,7 @@ import io.servicecomb.saga.pack.contracts.thrift.SwiftTxEvent; import io.servicecomb.saga.pack.contracts.thrift.SwiftTxEventEndpoint; @RunWith(SpringRunner.class) -@SpringBootTest(classes = AlphaApplication.class) +@SpringBootTest(classes = AlphaApplication.class, properties = "alpha.server.port=8090") public class AlphaIntegrationTest { private static final ThriftClientManager clientManager = new ThriftClientManager(); private static final String TX_STARTED_EVENT = "TxStartedEvent"; -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
