diff --git a/utils/src/com/cloud/utils/nio/Link.java b/utils/src/com/cloud/utils/nio/Link.java index 093c573924d..d353c242bd4 100755 --- a/utils/src/com/cloud/utils/nio/Link.java +++ b/utils/src/com/cloud/utils/nio/Link.java @@ -369,14 +369,18 @@ public class Link { sslContext = SSLContext.getInstance("TLS"); sslContext.init(kmf.getKeyManagers(), tms, null); - s_logger.info("SSL: SSLcontext has been initialized"); + if (s_logger.isTraceEnabled()) { + s_logger.trace("SSL: SSLcontext has been initialized"); + } return sslContext; } public static void doHandshake(SocketChannel ch, SSLEngine sslEngine, boolean isClient) throws IOException { - s_logger.info("SSL: begin Handshake, isClient: " + isClient); + if (s_logger.isTraceEnabled()) { + s_logger.trace("SSL: begin Handshake, isClient: " + isClient); + } SSLEngineResult engResult; SSLSession sslSession = sslEngine.getSession(); diff --git a/utils/src/com/cloud/utils/nio/NioConnection.java b/utils/src/com/cloud/utils/nio/NioConnection.java index f64919d2bac..a265226beaa 100755 --- a/utils/src/com/cloud/utils/nio/NioConnection.java +++ b/utils/src/com/cloud/utils/nio/NioConnection.java @@ -197,11 +197,15 @@ public abstract class NioConnection implements Runnable { sslEngine.setNeedClientAuth(false); Link.doHandshake(socketChannel, sslEngine, false); - s_logger.info("SSL: Handshake done"); } catch (Exception e) { - throw new IOException("SSL: Fail to init SSL! " + e); + logDebug(e, key, 0); + terminate(key); + return; } + if (s_logger.isTraceEnabled()) { + s_logger.trace("SSL: Handshake done"); + } socketChannel.configureBlocking(false); InetSocketAddress saddr = (InetSocketAddress)socket.getRemoteSocketAddress(); Link link = new Link(saddr, this);