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 19C82193DB for ; Thu, 24 Mar 2016 15:17:46 +0000 (UTC) Received: (qmail 20716 invoked by uid 500); 24 Mar 2016 15:17:45 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 20621 invoked by uid 500); 24 Mar 2016 15:17:45 -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 20558 invoked by uid 99); 24 Mar 2016 15:17:45 -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; Thu, 24 Mar 2016 15:17:45 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 639DFE1781; Thu, 24 Mar 2016 15:17:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: swill@apache.org To: commits@cloudstack.apache.org Date: Thu, 24 Mar 2016 15:17:47 -0000 Message-Id: <9f9b64e3fbdd4723841540eae228f03c@git.apache.org> In-Reply-To: <51d754c4f23144379cb7ff9d5df85214@git.apache.org> References: <51d754c4f23144379cb7ff9d5df85214@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [3/7] git commit: updated refs/heads/master to 5251eed Cloudstack 9285 for 4.7.x Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3683dff4 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3683dff4 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3683dff4 Branch: refs/heads/master Commit: 3683dff493e2493ac3f1ac0b572e8b21361c2134 Parents: a243339 Author: Simon Weller Authored: Mon Mar 7 16:23:35 2016 -0600 Committer: Simon Weller Committed: Tue Mar 8 09:48:13 2016 -0600 ---------------------------------------------------------------------- agent/src/com/cloud/agent/Agent.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3683dff4/agent/src/com/cloud/agent/Agent.java ---------------------------------------------------------------------- diff --git a/agent/src/com/cloud/agent/Agent.java b/agent/src/com/cloud/agent/Agent.java index 994e822..2dee5a4 100644 --- a/agent/src/com/cloud/agent/Agent.java +++ b/agent/src/com/cloud/agent/Agent.java @@ -227,7 +227,7 @@ public class Agent implements HandlerFactory, IAgentControl { try { _connection.start(); } catch (final NioConnectionException e) { - throw new CloudRuntimeException("Unable to start the connection!", e); + s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again..."); } while (!_connection.isStartup()) { _shell.getBackoffAlgorithm().waitBeforeRetry(); @@ -235,7 +235,7 @@ public class Agent implements HandlerFactory, IAgentControl { try { _connection.start(); } catch (final NioConnectionException e) { - throw new CloudRuntimeException("Unable to start the connection!", e); + s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again..."); } } } @@ -412,7 +412,7 @@ public class Agent implements HandlerFactory, IAgentControl { try { _connection.start(); } catch (final NioConnectionException e) { - throw new CloudRuntimeException("Unable to start the connection!", e); + s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again..."); } _shell.getBackoffAlgorithm().waitBeforeRetry(); } while (!_connection.isStartup());