Merge pull request fluent#53 from ukinau/Fix_49_problem_with_exception_logging

repeatedly · repeatedly · commit 4974723720dd · 2016-04-14T16:57:06.000+09:00
Output traceback to log if msgpack raise exception
diff --git a/fluent/sender.py b/fluent/sender.py
@@ -4,6 +4,7 @@
 import socket
 import threading
 import time
+import traceback
 
 import msgpack
 
@@ -59,7 +60,13 @@ def emit(self, label, data):
         self.emit_with_time(label, cur_time, data)
 
     def emit_with_time(self, label, timestamp, data):
-        bytes_ = self._make_packet(label, timestamp, data)
+        try:
+            bytes_ = self._make_packet(label, timestamp, data)
+        except Exception:
+            bytes_ = self._make_packet(label, timestamp,
+                                       {"level": "CRITICAL",
+                                        "message": "Can't output to log",
+                                        "traceback": traceback.format_exc()})
         self._send(bytes_)
 
     def _make_packet(self, label, timestamp, data):
