diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-11-29 14:15:11 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-11-29 14:15:11 +0100 |
commit | ee4557adfd2eb93df402ace2627cdc44a8617ca1 (patch) | |
tree | 9230aff90735c5be2e671919a5bad39c74cf24e9 /config-model | |
parent | 1288549e39459b8aa17c9cf400f3b62006fb57a3 (diff) |
Improve warning for usage of deprecated 'domain' attribute
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java index 43fa515e7c3..866709df0b7 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/xml/HttpBuilder.java @@ -115,7 +115,12 @@ public class HttpBuilder extends VespaDomBuilder.DomConfigProducerBuilder<Http> throw new IllegalArgumentException( String.format("Domain in access-control ('%s') does not match tenant domain ('%s')", explicitDomain.value(), tenantDomain.value())); } - deployState.getDeployLogger().logApplicationPackage(Level.WARNING, "Domain in 'access-control' is deprecated and will be removed soon"); + deployState.getDeployLogger() + .logApplicationPackage(Level.WARNING, + "Domain in 'access-control' is deprecated and is no longer necessary. " + + "Please remove the 'domain' attribute from the 'access-control' element in services.xml. " + + "Mismatch between the Athenz domain associated with your tenant and the 'domain' " + + "attribute will be handled as an error."); } return tenantDomain != null ? tenantDomain : explicitDomain; } |