Merge pull request fluent#121 from arcivanov/issue_110

arcivanov · web-flow · commit 26ceba6f8982 · 2017-12-14T21:29:39.000-05:00
Sender now has a closed state and won't emit
diff --git a/fluent/sender.py b/fluent/sender.py
@@ -73,6 +73,7 @@ def __init__(self,
         self.socket = None
         self.pendings = None
         self.lock = threading.Lock()
+        self._closed = False
         self._last_error_threadlocal = threading.local()
 
     def emit(self, label, data):
@@ -109,6 +110,9 @@ def clear_last_error(self, _thread_id=None):
 
     def close(self):
         with self.lock:
+            if self._closed:
+                return
+            self._closed = True
             if self.pendings:
                 try:
                     self._send_data(self.pendings)
@@ -130,6 +134,8 @@ def _make_packet(self, label, timestamp, data):
 
     def _send(self, bytes_):
         with self.lock:
+            if self._closed:
+                return False
             return self._send_internal(bytes_)
 
     def _send_internal(self, bytes_):
diff --git a/tests/test_sender.py b/tests/test_sender.py
@@ -146,6 +146,16 @@ def test_emit_error(self):
         self.assertEqual(len(data), 1)
         self.assertEqual(data[0][2]["message"], "Can't output to log")
 
+    def test_emit_after_close(self):
+        with self._sender as sender:
+            self.assertTrue(sender.emit("blah", {"a": "123"}))
+            sender.close()
+            self.assertFalse(sender.emit("blah", {"a": "456"}))
+
+        data = self._server.get_received()
+        self.assertEqual(len(data), 1)
+        self.assertEqual(data[0][2]["a"], "123")
+
     def test_verbose(self):
         with self._sender as sender:
             sender.verbose = True
