summaryrefslogtreecommitdiffstats
path: root/standalone-container/src
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2018-06-01 01:07:33 +0200
committerJon Bratseth <bratseth@oath.com>2018-06-01 01:07:33 +0200
commitf7d0fe5fdfad579e867f01acc1d41b2ec77bd785 (patch)
tree2c9b2241bf49a01cf84a6fc0e3dd221b08fb30fe /standalone-container/src
parent4919fb84be7edc03f7c7feb0080ff0c5f705f654 (diff)
Separate internal redeploys from application package changes
Separate system internal redeploys from application package changes such that we can ignore config updates originating from application package changes if restart on deploy is true, as the config change will be followed by a restart - but continue to effect config changes originating from internal system changes as those will not (and should not) be followed by a restart.
Diffstat (limited to 'standalone-container/src')
-rw-r--r--standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala3
1 files changed, 3 insertions, 0 deletions
diff --git a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala
index 99cc8259ab3..1bc95f52313 100644
--- a/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala
+++ b/standalone-container/src/main/scala/com/yahoo/container/standalone/StandaloneSubscriberFactory.scala
@@ -21,6 +21,8 @@ class StandaloneSubscriberFactory(root: VespaModel) extends SubscriberFactory {
override def close() {}
+ override def internalRedeploy() = { false }
+
override def config = {
def getConfig(key: ConfigKeyT) = {
@@ -46,6 +48,7 @@ class StandaloneSubscriberFactory(root: VespaModel) extends SubscriberFactory {
//if waitNextGeneration has not yet been called, -1 should be returned
var generation = -1L
+
}
override def getSubscriber(configKeys: java.util.Set[_ <: ConfigKey[_]]) =