Also tone down SSL handshake exception log in TCP server and client

Author: DerGuteMoritz

src/aleph/http/client.clj

@@ -108,7 +108,7 @@
     (s/put! response-stream ex)
 
     ;; when SSL handshake failed
-    (http/ssl-handshake-error? ex)
+    (netty/ssl-handshake-error? ex)
     (let [^Throwable handshake-error (.getCause ^Throwable ex)]
       (s/put! response-stream handshake-error))
 

src/aleph/http/core.clj

@@ -23,7 +23,6 @@
      ByteBuf]
     [java.nio
      ByteBuffer]
-    [io.netty.handler.codec DecoderException]
     [io.netty.handler.codec.http
      DefaultHttpRequest DefaultLastHttpContent
      DefaultHttpResponse DefaultFullHttpRequest
@@ -62,8 +61,7 @@
      ConcurrentLinkedQueue
      TimeUnit]
     [java.util.concurrent.atomic
-     AtomicBoolean]
-    [javax.net.ssl SSLHandshakeException]))
+     AtomicBoolean]))
 
 (def non-standard-keys
   (let [ks ["Content-MD5"
@@ -684,7 +682,3 @@
              (when (and (identical? ::ping-timeout v)
                         (.isOpen ^Channel (.channel ctx)))
                (netty/close ctx))))))))
-
-(defn ssl-handshake-error? [^Throwable ex]
-  (and (instance? DecoderException ex)
-       (instance? SSLHandshakeException (.getCause ex))))

src/aleph/http/server.clj

@@ -211,7 +211,7 @@
 (defn exception-handler [ctx ex]
   (cond
     ;; do not need to log an entire stack trace when SSL handshake failed
-    (http/ssl-handshake-error? ex)
+    (netty/ssl-handshake-error? ex)
     (log/warn "SSL handshake failure:"
               (.getMessage ^Throwable (.getCause ^Throwable ex)))
 

src/aleph/netty.clj

@@ -37,6 +37,7 @@
      SslContext
      SslContextBuilder
      SslHandler]
+    [io.netty.handler.codec DecoderException]
     [io.netty.handler.ssl.util
      SelfSignedCertificate InsecureTrustManagerFactory]
     [io.netty.resolver
@@ -76,7 +77,8 @@
      LoggingHandler
      LogLevel]
     [java.security.cert X509Certificate]
-    [java.security PrivateKey]))
+    [java.security PrivateKey]
+    [javax.net.ssl SSLHandshakeException]))
 
 ;;;
 
@@ -789,6 +791,11 @@
           ^SslHandler (.get SslHandler)
           .engine
           .getSession))
+
+(defn ssl-handshake-error? [^Throwable ex]
+  (and (instance? DecoderException ex)
+       (instance? SSLHandshakeException (.getCause ex))))
+
 ;;;
 
 (defprotocol AlephServer

src/aleph/tcp.clj

@@ -30,8 +30,14 @@
 
       :exception-caught
       ([_ ctx ex]
-        (when-not (instance? IOException ex)
-          (log/warn ex "error in TCP server")))
+       (cond
+         ;; do not need to log an entire stack trace when SSL handshake failed
+         (netty/ssl-handshake-error? ex)
+         (log/warn "SSL handshake failure:"
+                   (.getMessage ^Throwable (.getCause ^Throwable ex)))
+
+         (not (instance? IOException ex))
+         (log/warn ex "error in TCP server")))
 
       :channel-inactive
       ([_ ctx]
@@ -98,7 +104,11 @@
        :exception-caught
        ([_ ctx ex]
          (when-not (d/error! d ex)
-           (log/warn ex "error in TCP client")))
+           (if (netty/ssl-handshake-error? ex)
+             ;; do not need to log an entire stack trace when SSL handshake failed
+             (log/warn "SSL handshake failure:"
+                       (.getMessage ^Throwable (.getCause ^Throwable ex)))
+             (log/warn ex "error in TCP client"))))
 
        :channel-inactive
        ([_ ctx]