diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-12-07 09:55:42 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-12-07 09:55:42 +0100 |
commit | ddac99566ca559b720304299351ec4032e73e736 (patch) | |
tree | 6f929c9bed5524ab90d17e51d24eeeda3fe36909 /container-disc | |
parent | c183491dd0d3ad22477f4c1f884bec07156956bf (diff) |
Revert "Merge pull request #15690 from vespa-engine/revert-15686-bratseth/simplify-config"
This reverts commit a90709008ec0d108ee9a2e26bda20e39a10424b5, reversing
changes made to fcb2b4a2fd7a594520613c48d58e26963c68ea90.
Diffstat (limited to 'container-disc')
-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; |