diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-12-04 16:33:53 +0100 |
---|---|---|
committer | Jon Bratseth <bratseth@gmail.com> | 2020-12-04 16:33:53 +0100 |
commit | 11a6adc99f91e41a9fc444a5c7e3db506f679cc6 (patch) | |
tree | 8f07e130bb24cea54c3dbc88fa22c160b3bf91f6 /container-disc | |
parent | 8091fb8275d26af887ccc6e20058ab4d16787d05 (diff) |
Keep internal-redeploy serverside. Remove old restartOnDeploy implementation.
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; |