diff --git a/examples/cluster-example/data/src/main/java/com/kevin/sample/data/Main.java b/examples/cluster-example/data/src/main/java/com/kevin/sample/data/Main.java index 7ba1af3..cb33277 100644 --- a/examples/cluster-example/data/src/main/java/com/kevin/sample/data/Main.java +++ b/examples/cluster-example/data/src/main/java/com/kevin/sample/data/Main.java @@ -6,6 +6,6 @@ public class Main extends AbstractVerticle { public static void main(String[] args) { - OriginAppApplication.runAsCluster(Main.class); + OriginAppApplication.runAsSingle(Main.class); } } diff --git a/origin-starter-app/src/main/java/com/origin/starter/app/OriginAppApplication.java b/origin-starter-app/src/main/java/com/origin/starter/app/OriginAppApplication.java index 38c11a3..1e30d2c 100644 --- a/origin-starter-app/src/main/java/com/origin/starter/app/OriginAppApplication.java +++ b/origin-starter-app/src/main/java/com/origin/starter/app/OriginAppApplication.java @@ -69,6 +69,8 @@ private static void init(Vertx vertx, Class clazz) { Future.all(configFuture, appBeanFactoryFuture, deployFuture).onComplete(ar -> { if (ar.succeeded()) { List results = ar.result().list(); + JsonObject appConfig = (JsonObject) results.get(0); + originConfig.setAppConfig(appConfig); VERTX_CONTENT_THREAD_LOCAL.set(originVertxContent); CONFIG_FACTORY_THREAD_LOCAL.set(originConfig); log.info("*** context, config injected."); diff --git a/origin-starter-app/src/main/java/com/origin/starter/app/domain/OriginAppConfig.java b/origin-starter-app/src/main/java/com/origin/starter/app/domain/OriginAppConfig.java index 25f3085..43eff0d 100644 --- a/origin-starter-app/src/main/java/com/origin/starter/app/domain/OriginAppConfig.java +++ b/origin-starter-app/src/main/java/com/origin/starter/app/domain/OriginAppConfig.java @@ -4,6 +4,7 @@ import io.vertx.config.ConfigRetriever; import io.vertx.config.ConfigRetrieverOptions; import io.vertx.config.ConfigStoreOptions; +import io.vertx.core.Future; import io.vertx.core.Vertx; import io.vertx.core.eventbus.EventBus; import io.vertx.core.json.JsonObject; @@ -39,4 +40,5 @@ public OriginAppConfig fromVertx(Vertx vertx) { return this; } + } diff --git a/origin-starter-web/src/main/java/com/origin/starter/web/OriginWebApplication.java b/origin-starter-web/src/main/java/com/origin/starter/web/OriginWebApplication.java index 14fa90d..57e493d 100644 --- a/origin-starter-web/src/main/java/com/origin/starter/web/OriginWebApplication.java +++ b/origin-starter-web/src/main/java/com/origin/starter/web/OriginWebApplication.java @@ -80,6 +80,8 @@ private static void init(Vertx vertx, Class clazz) { OriginConfig originConfig = new OriginConfig().fromVertx(vertx); OriginWebBeanFactory beanFactory = new OriginWebBeanFactory(originVertxContext); log.info("** prepared context and config."); + Future configFuture = originConfig.getRetriever().getConfig(); + log.info("** prepared load app config."); Future starterFuture = new HttpStarter(originVertxContext, originConfig).startHttpServer(); log.info("** prepared start http server."); @@ -87,14 +89,19 @@ private static void init(Vertx vertx, Class clazz) { log.info("** prepared load bean configuration."); Future deployFuture = vertx.deployVerticle(clazz, new DeploymentOptions()); log.info("** prepared start http server."); - Future.all(starterFuture, loadBeanFutures, deployFuture).onComplete(cf -> { + + Future.all(configFuture, starterFuture, loadBeanFutures, deployFuture).onComplete(cf -> { if (cf.succeeded()) { List results = cf.result().list(); + JsonObject appConfig = (JsonObject) results.get(0); + originConfig.setAppConfig(appConfig); + log.info("*** app config loaded, app config is {}.", appConfig); + CONFIG_FACTORY_THREAD_LOCAL.set(originConfig); + log.info("*** server started, ready to accept requests."); VERTX_CONTENT_THREAD_LOCAL.set(originVertxContext); - CONFIG_FACTORY_THREAD_LOCAL.set(originConfig); ORIGIN_BEAN_FACTORY_THREAD_LOCAL.set(beanFactory); - log.info("*** beanfactory injected, detail {}", results.get(1)); + log.info("*** beanfactory injected, detail {}", results.get(2)); new OriginRouterFactory(originVertxContext, originConfig).register(); log.info("*** router injected"); log.info("* {}'s server start finished.", clazz.getName()); diff --git a/origin-starter-web/src/main/java/com/origin/starter/web/core/HttpStarter.java b/origin-starter-web/src/main/java/com/origin/starter/web/core/HttpStarter.java index 2159395..91ed46e 100644 --- a/origin-starter-web/src/main/java/com/origin/starter/web/core/HttpStarter.java +++ b/origin-starter-web/src/main/java/com/origin/starter/web/core/HttpStarter.java @@ -24,6 +24,7 @@ public Future startHttpServer() { .onComplete(aServerConfig -> { if (aServerConfig.succeeded()) { JsonObject serverConfig = aServerConfig.result().getJsonObject("server"); + log.info("{}",serverConfig); int port = serverConfig.getInteger("port"); vertxContext.getServer().listen(port) .onComplete(sar -> { diff --git a/origin-starter-web/src/main/java/com/origin/starter/web/domain/OriginConfig.java b/origin-starter-web/src/main/java/com/origin/starter/web/domain/OriginConfig.java index acaf2e5..e6381b2 100644 --- a/origin-starter-web/src/main/java/com/origin/starter/web/domain/OriginConfig.java +++ b/origin-starter-web/src/main/java/com/origin/starter/web/domain/OriginConfig.java @@ -4,6 +4,7 @@ import io.vertx.config.ConfigRetriever; import io.vertx.config.ConfigRetrieverOptions; import io.vertx.config.ConfigStoreOptions; +import io.vertx.core.Future; import io.vertx.core.Vertx; import io.vertx.core.eventbus.EventBus; import io.vertx.core.json.JsonObject; @@ -39,4 +40,5 @@ public OriginConfig fromVertx(Vertx vertx) { return this; } + }