support event post, with timestamp

kzk · kzk · commit 75cd01c82dfc · 2012-01-13T13:26:38.000+09:00
diff --git a/fluent/event.py b/fluent/event.py
@@ -1,8 +1,10 @@
 from fluent import sender
+import time
 
 class Event(object):
     def __init__(self, label, data, **kwargs):
         if not isinstance(data, dict) :
             raise Exception("data must be dict")
-        l = ('sender' in kwargs) and kwargs['sender'] or sender.get_global_sender()
-        l.emit(label, data)
+        s = kwargs['sender'] if ('sender' in kwargs) else sender.get_global_sender()
+        timestamp = kwargs['time'] if ('time' in kwargs) else int(time.time())
+        s.emit_with_time(label, timestamp, data)
diff --git a/fluent/sender.py b/fluent/sender.py
@@ -43,16 +43,19 @@ def __init__(self,
             self._close()
 
     def emit(self, label, data):
-        bytes = self._make_packet(label, data)
+        cur_time = int(time.time())
+        self.emit_with_time(label, cur_time, data)
+
+    def emit_with_time(self, label, timestamp, data):
+        bytes = self._make_packet(label, timestamp, data)
         self._send(bytes)
 
-    def _make_packet(self, label, data):
+    def _make_packet(self, label, timestamp, data):
         if label:
             tag = '.'.join((self.tag, label))
         else:
             tag = self.tag
-        cur_time = int(time.time())
-        packet = (tag, cur_time, data)
+        packet = (tag, timestamp, data)
         if self.verbose:
             print packet
         return self.packer.pack(packet)
diff --git a/tests/test_event.py b/tests/test_event.py
@@ -1,4 +1,5 @@
 import unittest
+import time
 
 import fluent
 from fluent import event, sender
@@ -12,3 +13,10 @@ def testLogging(self):
           'from': 'userA',
           'to':   'userB'
         })
+
+        # send event with tag app.follow, with timestamp
+        event.Event('follow', {
+          'from': 'userA',
+          'to':   'userB'
+        }, time=int(0))
+
