From b60efeaad82c63d4b00eb83285b6701ae3e7a73e Mon Sep 17 00:00:00 2001
From: jbonofre <jbonofre@apache.org>
Date: Thu, 5 Mar 2020 07:54:28 +0100
Subject: [PATCH] [AMQ-7301] Improve logging when initialize Stomp NIO SSL
 connection

---
 .../java/org/apache/activemq/broker/TransportConnector.java  | 5 ++++-
 .../activemq/transport/stomp/StompNIOSSLTransport.java       | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
index 20a2394aba..1008285ecd 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/TransportConnector.java
@@ -241,8 +241,11 @@ public class TransportConnector implements Connector, BrokerServiceAware {
                 if (brokerService != null && brokerService.isStopping()) {
                     LOG.info("Could not accept connection during shutdown {} : {}", (remoteHost == null ? "" : "from " + remoteHost), error.getLocalizedMessage());
                 } else {
-                    LOG.warn("Could not accept connection {} : {}", (remoteHost == null ? "" : "from " + remoteHost), error.getLocalizedMessage());
+                    LOG.debug("Could not accept connection from {}: {}", remoteHost, error.getMessage());
                     LOG.debug("Reason: " + error.getMessage(), error);
+                    if (error != null && error.getMessage() != null && remoteHost != null) {
+                        LOG.warn("Could not accept connection from {}: {}", remoteHost, error.toString());
+                    }
                 }
             }
         });
diff --git a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompNIOSSLTransport.java b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompNIOSSLTransport.java
index 5e899aeddf..beefa8f9c9 100644
--- a/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompNIOSSLTransport.java
+++ b/activemq-stomp/src/main/java/org/apache/activemq/transport/stomp/StompNIOSSLTransport.java
@@ -26,6 +26,7 @@ import java.security.cert.X509Certificate;
 
 import javax.net.SocketFactory;
 import javax.net.ssl.SSLEngine;
+import javax.net.ssl.SSLHandshakeException;
 
 import org.apache.activemq.transport.nio.NIOSSLTransport;
 import org.apache.activemq.wireformat.WireFormat;
@@ -64,7 +65,7 @@ public class StompNIOSSLTransport extends NIOSSLTransport {
                 serviceRead();
             }
         } catch (IOException e) {
-            LOGGER.warn("Could not initialize connection from {}", socket.getInetAddress().getHostAddress(), e);
+            LOGGER.warn("Could not initialize connection from {}: {} ({})", socket.getInetAddress().getHostAddress(), e.getMessage(), e.getCause().getMessage());
         }
     }