diff options
| author | Arne H Juul <arnej@yahooinc.com> | 2022-01-03 13:05:08 +0000 |
|---|---|---|
| committer | Arne H Juul <arnej@yahooinc.com> | 2022-01-03 13:05:08 +0000 |
| commit | ef67e176184d8d2261d9f6de788897c37fea0294 (patch) | |
| tree | ac87d6d673b92b44a7dd19eaf322b1e72c38ed64 /configserver | |
| parent | 2ff775ff41d2d759c62f7423a34c795c3ea2a504 (diff) | |
| parent | 1f3e5d1003a33d9a7076575eab8059c582611cdb (diff) | |
Merge branch 'master' into arnej/feature-flag-for-user-agents
Conflicts:
config-model-api/src/main/java/com/yahoo/config/model/api/ModelContext.java
configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java
Diffstat (limited to 'configserver')
| -rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/deploy/ModelContextImpl.java | 3 |
1 files changed, 3 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 942a84a2730..a77a8d1b5b8 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 @@ -206,6 +206,7 @@ public class ModelContextImpl implements ModelContext { private final boolean failDeploymentWithInvalidJvmOptions; private final double tlsSizeFraction; private final List<String> ignoredHttpUserAgents; + private final boolean enableServerOcspStapling; public FeatureFlags(FlagSource source, ApplicationId appId) { this.defaultTermwiseLimit = flagValue(source, appId, Flags.DEFAULT_TERM_WISE_LIMIT); @@ -250,6 +251,7 @@ public class ModelContextImpl implements ModelContext { this.failDeploymentWithInvalidJvmOptions = flagValue(source, appId, Flags.FAIL_DEPLOYMENT_WITH_INVALID_JVM_OPTIONS); this.tlsSizeFraction = flagValue(source, appId, Flags.TLS_SIZE_FRACTION); this.ignoredHttpUserAgents = flagValue(source, appId, PermanentFlags.IGNORED_HTTP_USER_AGENTS); + this.enableServerOcspStapling = flagValue(source, appId, Flags.ENABLE_SERVER_OCSP_STAPLING); } @Override public double defaultTermwiseLimit() { return defaultTermwiseLimit; } @@ -296,6 +298,7 @@ public class ModelContextImpl implements ModelContext { @Override public int maxCompactBuffers() { return maxCompactBuffers; } @Override public double tlsSizeFraction() { return tlsSizeFraction; } @Override public List<String> ignoredHttpUserAgents() { return ignoredHttpUserAgents; } + @Override public boolean enableServerOcspStapling() { return enableServerOcspStapling; } private static <V> V flagValue(FlagSource source, ApplicationId appId, UnboundFlag<? extends V, ?, ?> flag) { return flag.bindTo(source) |