Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0FE5D181B7 for ; Mon, 7 Dec 2015 20:42:27 +0000 (UTC) Received: (qmail 15906 invoked by uid 500); 7 Dec 2015 20:42:25 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 15828 invoked by uid 500); 7 Dec 2015 20:42:25 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 15484 invoked by uid 99); 7 Dec 2015 20:42:25 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 07 Dec 2015 20:42:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 26A7BE0901; Mon, 7 Dec 2015 20:42:25 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: remi@apache.org To: commits@cloudstack.apache.org Date: Mon, 07 Dec 2015 20:42:30 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [07/10] git commit: updated refs/heads/master to e08294a CLOUDSTACK-9106 - Makes Enum name compliant with Java code conventions. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/14db2d3d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/14db2d3d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/14db2d3d Branch: refs/heads/master Commit: 14db2d3dc4f8afefaa48a52c70d8141b8b4222ad Parents: 5973f4e Author: Wilder Rodrigues Authored: Mon Dec 7 13:43:46 2015 +0100 Committer: Wilder Rodrigues Committed: Mon Dec 7 13:43:46 2015 +0100 ---------------------------------------------------------------------- server/src/com/cloud/server/StatsCollector.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/14db2d3d/server/src/com/cloud/server/StatsCollector.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/server/StatsCollector.java b/server/src/com/cloud/server/StatsCollector.java index 9f3c8cb..ca86cfd 100644 --- a/server/src/com/cloud/server/StatsCollector.java +++ b/server/src/com/cloud/server/StatsCollector.java @@ -125,11 +125,11 @@ import com.cloud.vm.dao.VMInstanceDao; @Component public class StatsCollector extends ManagerBase implements ComponentMethodInterceptable { - public static enum externalStatsProtocol { + public static enum ExternalStatsProtocol { NONE("none"), GRAPHITE("graphite"); String _type; - externalStatsProtocol(String type) { + ExternalStatsProtocol(String type) { _type = type; } @@ -218,7 +218,7 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc String externalStatsHost = null; int externalStatsPort = -1; boolean externalStatsEnabled = false; - externalStatsProtocol externalStatsType = externalStatsProtocol.NONE; + ExternalStatsProtocol externalStatsType = ExternalStatsProtocol.NONE; private ScheduledExecutorService _diskStatsUpdateExecutor; private int _usageAggregationRange = 1440; @@ -266,7 +266,7 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc String scheme = uri.getScheme(); try { - externalStatsType = externalStatsProtocol.valueOf(scheme.toUpperCase()); + externalStatsType = ExternalStatsProtocol.valueOf(scheme.toUpperCase()); } catch (IllegalArgumentException e) { s_logger.info(scheme + " is not a valid protocol for external statistics. No statistics will be send."); } @@ -492,7 +492,7 @@ public class StatsCollector extends ManagerBase implements ComponentMethodInterc * Currently only Graphite is supported */ if (!metrics.isEmpty()) { - if (externalStatsType != null && externalStatsType == externalStatsProtocol.GRAPHITE) { + if (externalStatsType != null && externalStatsType == ExternalStatsProtocol.GRAPHITE) { if (externalStatsPort == -1) { externalStatsPort = 2003;