STORM-3244 default to ui filter if logviewer filter is not set
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e63dee61 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e63dee61 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e63dee61 Branch: refs/heads/master Commit: e63dee617bdbdb8294978ab8442b2dd1e007b2b9 Parents: 9cad341 Author: Aaron Gresch <agre...@yahoo-inc.com> Authored: Fri Oct 5 13:52:53 2018 -0500 Committer: Aaron Gresch <agre...@yahoo-inc.com> Committed: Fri Oct 5 13:52:53 2018 -0500 ---------------------------------------------------------------------- .../apache/storm/daemon/logviewer/LogviewerServer.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/e63dee61/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java ---------------------------------------------------------------------- diff --git a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java index b772aa5..daa53bc 100644 --- a/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java +++ b/storm-webapp/src/main/java/org/apache/storm/daemon/logviewer/LogviewerServer.java @@ -18,8 +18,6 @@ package org.apache.storm.daemon.logviewer; -import static org.apache.storm.DaemonConfig.UI_HEADER_BUFFER_BYTES; - import com.codahale.metrics.Meter; import com.google.common.annotations.VisibleForTesting; @@ -29,6 +27,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import org.apache.commons.lang.StringUtils; import org.apache.storm.DaemonConfig; import org.apache.storm.daemon.logviewer.utils.DirectoryCleaner; import org.apache.storm.daemon.logviewer.utils.ExceptionMeterNames; @@ -64,9 +63,14 @@ public class LogviewerServer implements AutoCloseable { Server ret = null; if (logviewerHttpPort != null && logviewerHttpPort >= 0) { LOG.info("Starting Logviewer HTTP servers..."); + String filterParamKey = DaemonConfig.LOGVIEWER_FILTER_PARAMS; String filterClass = (String) (conf.get(DaemonConfig.LOGVIEWER_FILTER)); + if (StringUtils.isBlank(filterClass)) { + filterClass = (String) (conf.get(DaemonConfig.UI_FILTER)); + filterParamKey = DaemonConfig.UI_FILTER_PARAMS; + } @SuppressWarnings("unchecked") - Map<String, String> filterParams = (Map<String, String>) (conf.get(DaemonConfig.LOGVIEWER_FILTER_PARAMS)); + Map<String, String> filterParams = (Map<String, String>) (conf.get(filterParamKey)); FilterConfiguration filterConfiguration = new FilterConfiguration(filterClass, filterParams); final List<FilterConfiguration> filterConfigurations = Arrays.asList(filterConfiguration);
