Skip all the SSL logic if not needed

Author: skwashd

logstash/handler_tcp.py

@@ -2,6 +2,7 @@
 from logging.handlers import SocketHandler
 from logstash import formatter
 
+from pprint import pprint
 
 # Derive from object to force a new-style class and thus allow super() to work
 # on Python 2.6
@@ -39,13 +40,14 @@ def makePickle(self, record):
 
     def makeSocket(self, timeout=1):
         s = super(TCPLogstashHandler, self).makeSocket(timeout)
+        if not self.ssl:
+            return s
+
         cert_reqs = ssl.CERT_REQUIRED
         if not self.ssl_verify:
             if self.ca_certs:
                 cert_reqs = ssl.CERT_OPTIONAL
             else:
                 cert_reqs = ssl.CERT_NONE
 
-        if self.ssl:
-            return ssl.wrap_socket(s, keyfile=self.keyfile, certfile=self.certfile, ca_certs=self.ca_certs, cert_reqs=cert_reqs)
-        return s
+        return ssl.wrap_socket(s, keyfile=self.keyfile, certfile=self.certfile, ca_certs=self.ca_certs, cert_reqs=cert_reqs)