diff options
author | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-09-01 12:51:17 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2016-09-01 12:51:17 +0200 |
commit | 799f5e4b77892bb04cb7ddff2c90c309b7609f2b (patch) | |
tree | 637321b0371a39f273a9429b6874c278a1a41544 /container-disc | |
parent | 461e0d118d0d71faf4a0c0bb94f1a8b482997335 (diff) |
Terminate vm on failed configuration in Bootstrap instead of ConfiguredApplication
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index 21820a95aa6..7dcbdfa251b 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -116,17 +116,13 @@ public final class ConfiguredApplication implements Application { @Override public void start() { - try { - ContainerDiscApplication.hackToInitializeServer(getConfig(QrConfig.class)); + ContainerDiscApplication.hackToInitializeServer(getConfig(QrConfig.class)); - ContainerBuilder builder = createBuilderWithGuiceBindings(); - configureComponents(builder.guiceModules().activate()); + ContainerBuilder builder = createBuilderWithGuiceBindings(); + configureComponents(builder.guiceModules().activate()); - intitializeAndActivateContainer(builder); - startReconfigurerThread(); - } catch (Exception e) { - com.yahoo.protect.Process.logAndDie("Failed starting container:", e); - } + intitializeAndActivateContainer(builder); + startReconfigurerThread(); } private <T extends ConfigInstance> T getConfig(Class<T> configClass) { |