diff options
author | Jon Bratseth <bratseth@oath.com> | 2020-12-08 12:44:25 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-08 12:44:25 +0100 |
commit | f1bd49e766f563503e1bfa7c9ac974f4bf6e754f (patch) | |
tree | b23dfd4a56c2fabf908aa9bc3e4df983e04d2264 /container-disc/src/main/java/com | |
parent | 8681ebd510f3db8fd64f065f3a40466fa3888ef2 (diff) | |
parent | 61a1631be626eb303bab5a5d56b3b499ba5cf2f5 (diff) |
Merge pull request #15734 from vespa-engine/bratseth/simplify-config-take-2
Bratseth/simplify config take 2
Diffstat (limited to 'container-disc/src/main/java/com')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 6 |
1 files changed, 1 insertions, 5 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 3158c06b0b1..f32d7dfbb02 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 @@ -261,16 +261,12 @@ public final class ConfiguredApplication implements Application { private void startReconfigurerThread() { reconfigurerThread = new Thread(() -> { - boolean restartOnDeploy = false; while ( ! Thread.interrupted()) { try { ContainerBuilder builder = createBuilderWithGuiceBindings(); - // Restart on deploy is sticky: Once it is set no future generation should be applied until restart - restartOnDeploy = restartOnDeploy || qrConfig.restartOnDeploy(); - // Block until new config arrives, and it should be applied - configurer.getNewComponentGraph(builder.guiceModules().activate(), restartOnDeploy); + configurer.getNewComponentGraph(builder.guiceModules().activate()); initializeAndActivateContainer(builder); } catch (ConfigInterruptedException e) { break; |