diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-12-04 22:30:51 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-04 22:30:51 +0100 |
commit | fb23cab6f56aae990ea4ab9bced71a0be1ac0ab6 (patch) | |
tree | d38173e0dbb0ff2986bbb9decdf53701880d2985 /container-disc | |
parent | fcb2b4a2fd7a594520613c48d58e26963c68ea90 (diff) |
Revert "Keep internal-redeploy serverside. Remove old restartOnDeploy implemeā¦"
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 6 |
1 files changed, 5 insertions, 1 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 f32d7dfbb02..3158c06b0b1 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,12 +261,16 @@ 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()); + configurer.getNewComponentGraph(builder.guiceModules().activate(), restartOnDeploy); initializeAndActivateContainer(builder); } catch (ConfigInterruptedException e) { break; |