AMBARI-18246. Logfeeder cleanup - appendum for branch-2.5 (oleewere) Change-Id: Ie7b8a669ecd418ca566b5d060d5f0a40ee84824f
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/149cb7de Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/149cb7de Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/149cb7de Branch: refs/heads/logsearch-ga Commit: 149cb7de87927137e1295e3b444df0f46aa26a9c Parents: 6fa4abf Author: oleewere <oleew...@gmail.com> Authored: Wed Sep 28 11:38:30 2016 +0200 Committer: oleewere <oleew...@gmail.com> Committed: Sat Nov 5 14:46:45 2016 +0100 ---------------------------------------------------------------------- .../apache/ambari/logfeeder/metrics/MetricsManager.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/149cb7de/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/MetricsManager.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/MetricsManager.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/MetricsManager.java index a679a33..fca2b20 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/MetricsManager.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/MetricsManager.java @@ -49,14 +49,14 @@ public class MetricsManager { LOG.info("Initializing MetricsManager()"); amsClient = new LogFeederAMSClient(); - if (amsClient.getCollectorUri(null) != null) { + if (amsClient.getCollectorUri() != null) { findNodeHostName(); if (nodeHostName == null) { isMetricsEnabled = false; LOG.error("Failed getting hostname for node. Disabling publishing LogFeeder metrics"); } else { isMetricsEnabled = true; - LOG.info("LogFeeder Metrics is enabled. Metrics host=" + amsClient.getCollectorUri(null)); + LOG.info("LogFeeder Metrics is enabled. Metrics host=" + amsClient.getCollectorUri()); } } else { LOG.info("LogFeeder Metrics publish is disabled"); @@ -80,14 +80,14 @@ public class MetricsManager { } if (nodeHostName == null) { isMetricsEnabled = false; - logger.error("Failed getting hostname for node. Disabling publishing LogFeeder metrics"); + LOG.error("Failed getting hostname for node. Disabling publishing LogFeeder metrics"); } else { isMetricsEnabled = true; - logger.info("LogFeeder Metrics is enabled. Metrics host=" - + amsClient.getCollectorUri(null)); + LOG.info("LogFeeder Metrics is enabled. Metrics host=" + + amsClient.getCollectorUri()); } } else { - logger.info("LogFeeder Metrics publish is disabled"); + LOG.info("LogFeeder Metrics publish is disabled"); } }