cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [03/17] git commit: updated refs/heads/4.9-mvn-upgrade to 1199ff8
Date Fri, 25 Mar 2016 21:39:52 GMT
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/4.9-mvn-upgrade
Commit: 3683dff493e2493ac3f1ac0b572e8b21361c2134
Parents: a243339
Author: Simon Weller <sweller@ena.com>
Authored: Mon Mar 7 16:23:35 2016 -0600
Committer: Simon Weller <sweller@ena.com>
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());


Mime
View raw message