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-core | |
| parent | fcb2b4a2fd7a594520613c48d58e26963c68ea90 (diff) | |
Revert "Keep internal-redeploy serverside. Remove old restartOnDeploy impleme…"
Diffstat (limited to 'container-core')
2 files changed, 5 insertions, 4 deletions
diff --git a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java index ac632f5acce..af163e88fee 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/HandlersConfigurerDi.java @@ -74,7 +74,7 @@ public class HandlersConfigurerDi { this.vespaContainer = vespaContainer; container = new Container(subscriberFactory, configId, deconstructor, osgiWrapper); - getNewComponentGraph(discInjector); + getNewComponentGraph(discInjector, false); } private static class ContainerAndDiOsgi extends OsgiImpl implements OsgiWrapper { @@ -128,9 +128,10 @@ public class HandlersConfigurerDi { /** * Wait for new config to arrive and produce the new graph */ - public void getNewComponentGraph(Injector discInjector) { + public void getNewComponentGraph(Injector discInjector, boolean restartOnRedeploy) { currentGraph = container.getNewComponentGraph(currentGraph, - createFallbackInjector(vespaContainer, discInjector)); + createFallbackInjector(vespaContainer, discInjector), + restartOnRedeploy); } private Injector createFallbackInjector(com.yahoo.container.Container vespaContainer, Injector discInjector) { diff --git a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java index 42e54d3a78f..d98a865e1fb 100644 --- a/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java +++ b/container-core/src/main/java/com/yahoo/container/core/config/testutil/HandlersConfigurerTestWrapper.java @@ -117,7 +117,7 @@ public class HandlersConfigurerTestWrapper { public void reloadConfig() { configurer.reloadConfig(++lastGeneration); - configurer.getNewComponentGraph(guiceInjector()); + configurer.getNewComponentGraph(guiceInjector(), false); } public void shutdown() { |