Merge pull request LogentriesCommunity#38 from graingert/avoid-using-lock-in-LE

Stephen Hynes · Stephen Hynes · commit eeb60b0a419b · 2015-08-17T16:17:19.000+01:00
Avoid using lock in emit
diff --git a/logentries/utils.py b/logentries/utils.py
@@ -12,8 +12,6 @@
 import time
 import sys
 
-lock = threading.Lock()
-
 import certifi
 
 # Size of the internal event queue
@@ -168,10 +166,6 @@ def __init__(self, token, force_tls=False, verbose=True, format=None):
         else:
             self._thread = SocketAppender(verbose=verbose)
 
-    @property
-    def _started(self):
-        return self._thread.is_alive()
-
     def flush(self):
         # wait for all queued logs to be send
         now = time.time()
@@ -183,19 +177,19 @@ def flush(self):
     def emit(self, record):
         # Reset stdout. See: http://docs.python.org/2/library/sys.html#sys.__stdout__
         sys.stdout = sys.__stdout__
-        lock.acquire()
-        try:
-            if not self._started and self.good_config:
+        if self.good_config and not self._thread.is_alive():
+            try:
+                self._thread.start()
                 if self.verbose:
                     dbg("Starting Logentries Asynchronous Socket Appender")
-                self._thread.start()
+            except RuntimeError: # It's already started.
+                if not self._thead.is_alive():
+                    raise
 
-            msg = self.format(record).rstrip('\n')
-            msg = self.token + msg
+        msg = self.format(record).rstrip('\n')
+        msg = self.token + msg
 
-            self._thread._queue.put(msg)
-        finally:
-            lock.release()
+        self._thread._queue.put(msg)
 
     def close(self):
         logging.Handler.close(self)
