fix label handling for logging.Handler interface

kzk · kzk · commit e4c11e98a76f · 2011-10-08T06:30:12.000+09:00
diff --git a/fluent/handler.py b/fluent/handler.py
@@ -65,7 +65,7 @@ def __init__(self,
     def emit(self, record):
         if record.levelno < self.level: return
         data = self.fmt.format(record)
-        self.sender.emit('', data)
+        self.sender.emit(None, data)
 
     def _close(self):
         self.sender._close()
diff --git a/fluent/sender.py b/fluent/sender.py
@@ -60,7 +60,10 @@ def _close(self):
         self.socket = None
 
     def _make_packet(self, label, data):
-        tag = '.'.join((self.tag, label))
+        if label:
+            tag = '.'.join((self.tag, label))
+        else:
+            tag = self.tag
         cur_time = int(time.time())
         packet = (tag, cur_time, data)
         if self.verbose:
diff --git a/tests/test_handler.py b/tests/test_handler.py
@@ -31,11 +31,11 @@ def test_simple(self):
         h._close()
 
         data = self.get_data()
-        #print
-        #eq = self.assertEqual
-        #eq(1, len(data))
-        #eq(3, len(data[0]))
-        #eq('test.foo', data[0][0])
-        #eq({'bar':'baz'}, data[0][2])
-        #self.assert_(data[0][1])
-        #self.assert_(isinstance(data[0][1], int))
+        eq = self.assertEqual
+        eq(1, len(data))
+        eq(3, len(data[0]))
+        eq('app.follow', data[0][0])
+        eq('userA', data[0][2]['from'])
+        eq('userB', data[0][2]['to'])
+        self.assert_(data[0][1])
+        self.assert_(isinstance(data[0][1], int))
