etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-9285 - Address original on start exception(s) and newline cleanup

This commit is contained in:
Simon Weller 2016-03-08 09:14:07 -06:00
parent 5b6fbe6aeb
commit c69a242897
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent/src/com/cloud/agent/Agent.java
View File

@ -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());