diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-08-13 17:27:41 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-08-13 17:27:41 +0200 |
| commit | 34335d6c0abbf53f487ff95fb425fee8d8f4bff1 (patch) | |
| tree | 8effa141232adadd0c1f7b3533c62c44d3007092 /config-model | |
| parent | 8faf5201ea8b01f34bbe1dd5668cf89d8111d634 (diff) | |
Don't use wildcard scheme in uri patterns
Diffstat (limited to 'config-model')
3 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java index 458bd5903fc..9b57f4ace95 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainerCluster.java @@ -40,7 +40,7 @@ public class LogserverContainerCluster extends ContainerCluster<LogserverContain private void addLogHandler() { Handler<?> logHandler = Handler.fromClassName(ContainerCluster.LOG_HANDLER_CLASS); - logHandler.addServerBindings("*://*/logs"); + logHandler.addServerBindings("http://*/logs"); addComponent(logHandler); } diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index 779d0eb028d..acb30ea005a 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -122,7 +122,7 @@ public abstract class ContainerCluster<CONTAINER extends Container> public static final String CMS = "-XX:+UseConcMarkSweepGC -XX:MaxTenuringThreshold=15 -XX:NewRatio=1"; public static final String G1GC = "-XX:+UseG1GC -XX:MaxTenuringThreshold=15"; - public static final String ROOT_HANDLER_BINDING = "*://*/"; + public static final String ROOT_HANDLER_BINDING = "http://*/"; private final String name; diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index 8b92e1091ca..270bc712b70 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -181,7 +181,7 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { JdiscBindingsConfig config = root.getConfig(JdiscBindingsConfig.class, "default/container.0"); JdiscBindingsConfig.Handlers defaultRootHandler = config.handlers(BindingsOverviewHandler.class.getName()); - assertThat(defaultRootHandler.serverBindings(), contains("*://*/")); + assertThat(defaultRootHandler.serverBindings(), contains("http://*/")); JdiscBindingsConfig.Handlers applicationStatusHandler = config.handlers(ApplicationStatusHandler.class.getName()); assertThat(applicationStatusHandler.serverBindings(), |