diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-09 16:16:48 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-09 16:16:48 +0100 |
commit | 4ab130ad441dd80aa865d21ccf0f03577cd65c68 (patch) | |
tree | dda3bb58164775fdfc80f52a34319f88f316e3be | |
parent | ce7bc88040b656b8e23c30a0413d01bff5872a54 (diff) |
Add application id as dimension for feature flag
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 3 | ||||
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/Flags.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java index 03821c8a85d..db90d3f9976 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java @@ -173,7 +173,8 @@ public class ModelContextImpl implements ModelContext { .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); this.usePhraseSegmenting = Flags.PHRASE_SEGMENTING.bindTo(flagSource) .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); - this.proxyProtocol = Flags.PROXY_PROTOCOL.bindTo(flagSource).value(); + this.proxyProtocol = Flags.PROXY_PROTOCOL.bindTo(flagSource) + .with(FetchVector.Dimension.APPLICATION_ID, applicationId.serializedForm()).value(); } @Override diff --git a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java index dd46c4b78dd..7d1da56a5dc 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/Flags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/Flags.java @@ -264,7 +264,8 @@ public class Flags { public static final UnboundStringFlag PROXY_PROTOCOL = defineStringFlag( "proxy-protocol", "https-only", "Enable proxy protocol support on application containers. Allowed values: ['https-only', 'https+proxy-protocol', 'proxy-protocol-only']", - "Takes effect on internal redeploy"); + "Takes effect on internal redeploy", + APPLICATION_ID); /** WARNING: public for testing: All flags should be defined in {@link Flags}. */ public static UnboundBooleanFlag defineFeatureFlag(String flagId, boolean defaultValue, String description, |