aboutsummaryrefslogtreecommitdiffstats
path: root/configserver/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-03-09 16:15:33 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-03-09 16:15:33 +0100
commitce7bc88040b656b8e23c30a0413d01bff5872a54 (patch)
tree0e983c8d16bfc4817005ed0ca995f942974d99e0 /configserver/src
parente15ef1f1b26ba0c7c844f2f0835416165bf5703d (diff)
Wire in feature flag for enabling proxy protocol in 4443 hosted connector
Diffstat (limited to 'configserver/src')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java4
1 files changed, 4 insertions, 0 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 a15b570a55d..03821c8a85d 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
@@ -136,6 +136,7 @@ public class ModelContextImpl implements ModelContext {
private final boolean useBucketSpaceMetric;
private final boolean useNewAthenzFilter;
private final boolean usePhraseSegmenting;
+ private final String proxyProtocol;
public Properties(ApplicationId applicationId,
boolean multitenantFromConfig,
@@ -172,6 +173,7 @@ 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();
}
@Override
@@ -232,6 +234,8 @@ public class ModelContextImpl implements ModelContext {
@Override
public boolean usePhraseSegmenting() { return usePhraseSegmenting; }
+ @Override
+ public String proxyProtocol() { return proxyProtocol; }
}
}