Merge release branch 4.8 to master

* 4.8:
  Additional exception logging for Cloudstack-9285
This commit is contained in:
Will Stevens 2016-04-12 08:58:38 -04:00
commit f313facb87

View File

@ -227,6 +227,7 @@ public class Agent implements HandlerFactory, IAgentControl {
try {
_connection.start();
} catch (final NioConnectionException e) {
s_logger.warn("NIO Connection Exception " + e);
s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
}
while (!_connection.isStartup()) {
@ -235,6 +236,7 @@ public class Agent implements HandlerFactory, IAgentControl {
try {
_connection.start();
} catch (final NioConnectionException e) {
s_logger.warn("NIO Connection Exception " + e);
s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
}
}
@ -412,6 +414,7 @@ public class Agent implements HandlerFactory, IAgentControl {
try {
_connection.start();
} catch (final NioConnectionException e) {
s_logger.warn("NIO Connection Exception " + e);
s_logger.info("Attempted to connect to the server, but received an unexpected exception, trying again...");
}
_shell.getBackoffAlgorithm().waitBeforeRetry();