diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-03-08 09:00:51 +0100 |
|---|---|---|
| committer | Harald Musum <musum@verizonmedia.com> | 2019-03-08 09:00:51 +0100 |
| commit | 7438e1d359aee6d8bae101a5f50edb47518fd632 (patch) | |
| tree | 78bc3d6e4982ab487c8bad0eafb4359513863252 | |
| parent | b6d30eb9c7370d35accf7b3a709259ae2916a03e (diff) | |
Add log handler to list of unprotected handlers
3 files changed, 4 insertions, 2 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java index c7941750a91..78217064722 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/admin/LogserverContainer.java @@ -31,7 +31,7 @@ public class LogserverContainer extends Container { } private void addLogHandler(ContainerCluster cluster) { - Handler<?> logHandler = Handler.fromClassName("com.yahoo.container.handler.LogHandler"); + Handler<?> logHandler = Handler.fromClassName(ContainerCluster.LOG_HANDLER_CLASS); logHandler.addServerBindings("http://*/logs", "https://*/logs"); cluster.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 b133ea1de4c..56f6149cac1 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 @@ -137,6 +137,7 @@ public final class ContainerCluster public static final String BINDINGS_OVERVIEW_HANDLER_CLASS = BindingsOverviewHandler.class.getName(); public static final String STATE_HANDLER_CLASS = "com.yahoo.container.jdisc.state.StateHandler"; public static final String STATISTICS_HANDLER_CLASS = "com.yahoo.container.config.StatisticsRequestHandler"; + public static final String LOG_HANDLER_CLASS = "com.yahoo.container.handler.LogHandler"; public static final String DEFAULT_LINGUISTICS_PROVIDER = "com.yahoo.language.provider.DefaultLinguisticsProvider"; public static final String CMS = "-XX:+UseConcMarkSweepGC -XX:MaxTenuringThreshold=15 -XX:NewRatio=1"; public static final String G1GC = "-XX:+UseG1GC -XX:MaxTenuringThreshold=15"; diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java index 0cea4a572b2..4220a6571a0 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/AccessControl.java @@ -34,7 +34,8 @@ public final class AccessControl { ContainerCluster.APPLICATION_STATUS_HANDLER_CLASS, ContainerCluster.BINDINGS_OVERVIEW_HANDLER_CLASS, ContainerCluster.STATE_HANDLER_CLASS, - ContainerCluster.STATISTICS_HANDLER_CLASS + ContainerCluster.STATISTICS_HANDLER_CLASS, + ContainerCluster.LOG_HANDLER_CLASS ); public static final class Builder { |