Merge pull request LogentriesCommunity#57 from eflanagan-r7/master

eflanagan-r7 · eflanagan-r7 · commit 3f64af552e4e · 2016-04-11T15:34:38.000Z
Now allows the user to choose between using TLS and non-TLS sockets
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1 @@
+*.pyc
diff --git a/logentries/utils.py b/logentries/utils.py
@@ -125,10 +125,13 @@ def run(self):
 
         self.close_connection()
 
+SocketAppender = PlainTextSocketAppender
+
 try:
     import ssl
+    ssl_enabled = True
 except ImportError:  # for systems without TLS support.
-    SocketAppender = PlainTextSocketAppender
+    ssl_enabled = False
     dbg("Unable to import ssl module. Will send over port 80.")
 else:
     class TLSSocketAppender(PlainTextSocketAppender):
@@ -150,14 +153,13 @@ def open_connection(self):
                 do_handshake_on_connect=True,
                 suppress_ragged_eofs=True,
             )
+
             sock.connect((self.le_api, self.le_tls_port))
             self._conn = sock
 
-    SocketAppender = TLSSocketAppender
-
 
 class LogentriesHandler(logging.Handler):
-    def __init__(self, token, force_tls=False, verbose=True, format=None, le_api=LE_API_DEFAULT, le_port=LE_PORT_DEFAULT, le_tls_port=LE_TLS_PORT_DEFAULT):
+    def __init__(self, token, use_tls=True, verbose=True, format=None, le_api=LE_API_DEFAULT, le_port=LE_PORT_DEFAULT, le_tls_port=LE_TLS_PORT_DEFAULT):
         logging.Handler.__init__(self)
         self.token = token
         self.good_config = True
@@ -174,7 +176,7 @@ def __init__(self, token, force_tls=False, verbose=True, format=None, le_api=LE_
                                        '%a %b %d %H:%M:%S %Z %Y')
         self.setFormatter(format)
         self.setLevel(logging.DEBUG)
-        if force_tls:
+        if use_tls and ssl_enabled:
             self._thread = TLSSocketAppender(verbose=verbose, le_api=le_api, le_port=le_port, le_tls_port=le_tls_port)
         else:
             self._thread = SocketAppender(verbose=verbose, le_api=le_api, le_port=le_port, le_tls_port=le_tls_port)
diff --git a/setup.cfg b/setup.cfg
@@ -0,0 +1,2 @@
+[egg_info]
+egg_base = /tmp
diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(
     name='Logentries',

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-from distutils.core import setup`
	`1`	`+from setuptools import setup`
`2`	`2`
`3`	`3`	`setup(`
`4`	`4`	`name='Logentries',`