Fix import queue.Empty, fix task_done call on empty queue

Author: dborenko

python_logging_rabbitmq/compat.py

@@ -4,10 +4,10 @@
 
 if sys.version_info[0] == 2:
     text_type = unicode
-    from Queue import Queue as Queue
+    from Queue import Queue as Queue, Empty as QueueEmpty
 else:
     text_type = str
-    from queue import Queue as Queue
+    from queue import Queue as Queue, Empty as QueueEmpty
 
 try:
     import ujson as json  # noqa: F401

python_logging_rabbitmq/handlers_oneway.py

@@ -7,7 +7,7 @@
 import pika
 from pika import credentials
 
-from .compat import Queue
+from .compat import Queue, QueueEmpty
 from .filters import FieldFilter
 from .formatters import JSONFormatter
 from .compat import ExceptionReporter
@@ -166,7 +166,7 @@ def message_worker(self):
                     )
                 )
 
-            except Queue.Empty:
+            except QueueEmpty:
                 continue
             except Exception:
                 self.channel, self.connection = None, None
@@ -175,9 +175,10 @@ def message_worker(self):
                 if self.stopping.is_set():
                     self.stopped.set()
                     break
-                self.queue.task_done()
-                if self.close_after_emit:
-                    self.close_connection()
+                if not self.queue.empty():
+                    self.queue.task_done()
+                    if self.close_after_emit:
+                        self.close_connection()
         self.stopped.set()
 
     def emit(self, record):