From commits-return-70001-archive-asf-public=cust-asf.ponee.io@cloudstack.apache.org Fri Jan 5 17:23:04 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 18201180647 for ; Fri, 5 Jan 2018 17:23:04 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 074DA160C3B; Fri, 5 Jan 2018 16:23:04 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4D721160C14 for ; Fri, 5 Jan 2018 17:23:03 +0100 (CET) Received: (qmail 30156 invoked by uid 500); 5 Jan 2018 16:23:02 -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 30147 invoked by uid 99); 5 Jan 2018 16:23:02 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Jan 2018 16:23:02 +0000 From: GitBox To: commits@cloudstack.apache.org Subject: [GitHub] rhtyd closed pull request #2274: CLOUDSTACK-10096 Can't reset integration.api.port and usage.sanity.ch? Message-ID: <151516938184.11797.11208429474840317777.gitbox@gitbox.apache.org> rhtyd closed pull request #2274: CLOUDSTACK-10096 Can't reset integration.api.port and usage.sanity.ch? URL: https://github.com/apache/cloudstack/pull/2274 This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index 9e237741c96..fdabd8c765d 100644 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -336,6 +336,7 @@ public boolean start() { final ConfigurationVO apiPortConfig = values.get(0); if (apiPortConfig.getValue() != null) { apiPort = Integer.parseInt(apiPortConfig.getValue()); + apiPort = (apiPort <= 0) ? null : apiPort; } } diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index bc8272a1b79..a8e24a47806 100644 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -562,7 +562,7 @@ "The interval (in milliseconds) when host stats are retrieved from agents.", null), HostRetry("Advanced", AgentManager.class, Integer.class, "host.retry", "2", "Number of times to retry hosts for creating a volume", null), - IntegrationAPIPort("Advanced", ManagementServer.class, Integer.class, "integration.api.port", null, "Default API port", null), + IntegrationAPIPort("Advanced", ManagementServer.class, Integer.class, "integration.api.port", null, "Default API port. To disable set it to 0 or negative.", null), InvestigateRetryInterval( "Advanced", HighAvailabilityManager.class, @@ -1276,7 +1276,7 @@ Integer.class, "usage.sanity.check.interval", null, - "Interval (in days) to check sanity of usage data", + "Interval (in days) to check sanity of usage data. To disable set it to 0 or negative.", null), UsageAggregationTimezone("Usage", ManagementServer.class, String.class, "usage.aggregation.timezone", "GMT", "The timezone to use for usage stats aggregation", null), TrafficSentinelIncludeZones( ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: users@infra.apache.org With regards, Apache Git Services