You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/03/24 16:17:46 UTC
[2/7] git commit: updated refs/heads/master to 5251eed
CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c69a2428
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c69a2428
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c69a2428
Branch: refs/heads/master
Commit: c69a2428977aed7df497a479a7e802e9d8d0e922
Parents: 5b6fbe6
Author: Simon Weller <sw...@ena.com>
Authored: Tue Mar 8 09:14:07 2016 -0600
Committer: Simon Weller <sw...@ena.com>
Committed: Tue Mar 8 09:14:07 2016 -0600
----------------------------------------------------------------------
agent/src/com/cloud/agent/Agent.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c69a2428/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 912d308..7e0a435 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...");
}
}
}
@@ -413,7 +413,6 @@ public class Agent implements HandlerFactory, IAgentControl {
_connection.start();
} catch (final NioConnectionException e) {
s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
-
}
_shell.getBackoffAlgorithm().waitBeforeRetry();
} while (!_connection.isStartup());