Repository: ambari Updated Branches: refs/heads/branch-2.5 52347d2e4 -> 41dad5b43
AMBARI-18953 : Merging Issues in AMS HA - LogSearch integration. (avijayan) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/41dad5b4 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/41dad5b4 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/41dad5b4 Branch: refs/heads/branch-2.5 Commit: 41dad5b4395ff6d555ab57f134482406b9196ff2 Parents: 52347d2 Author: Aravindan Vijayan <[email protected]> Authored: Mon Nov 21 12:56:49 2016 -0800 Committer: Aravindan Vijayan <[email protected]> Committed: Mon Nov 21 12:56:57 2016 -0800 ---------------------------------------------------------------------- .../org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java | 3 ++- .../java/org/apache/ambari/logfeeder/metrics/MetricsManager.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/41dad5b4/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java ---------------------------------------------------------------------- diff --git a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java index 6fcfd64..2bdd7c9 100644 --- a/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java +++ b/ambari-logsearch/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/metrics/LogFeederAMSClient.java @@ -27,6 +27,7 @@ import org.apache.log4j.Logger; import java.util.Collection; +// TODO: Refactor for failover public class LogFeederAMSClient extends AbstractTimelineMetricsSink { private static final Logger LOG = Logger.getLogger(LogFeederAMSClient.class); @@ -84,4 +85,4 @@ public class LogFeederAMSClient extends AbstractTimelineMetricsSink { return null; } -} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/41dad5b4/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 1a33847..1432c87 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 @@ -165,4 +165,4 @@ public class MetricsManager { (currMS - lastPublishTimeMS) / 1000 + " seconds ago, intervalConfigured=" + publishIntervalMS / 1000); } } -} +} \ No newline at end of file
