socrateslee
diff --git a/‎fluent/__init__.py
Lines changed: 0 additions & 23 deletions b/‎fluent/__init__.py
Lines changed: 0 additions & 23 deletions
diff --git a/‎fluent/logger.py
Lines changed: 14 additions & 3 deletions b/‎fluent/logger.py
Lines changed: 14 additions & 3 deletions
diff --git a/‎tests/test_handler.py
Lines changed: 3 additions & 3 deletions b/‎tests/test_handler.py
Lines changed: 3 additions & 3 deletions
@@ -1,23 +0,0 @@
-import json
-import urllib2
-
-from fluent import logger
-
-global_logger = None
-
-def setup(tag, **kwargs):
-    host = kwargs.has_key("host") and kwargs['host'] or 'localhost'
-    port = kwargs.has_key("port") and kwargs['port'] or 24224
-
-    global global_logger
-    global_logger = logger.FluentLogger(tag, host=host, port=port)
-
-class Event:
-    def __init__(self, label, data, **kwargs):
-        global global_logger
-        self.logger = kwargs.has_key("logger") and kwargs['logger'] or global_logger
-
-        if not isinstance(data, dict) :
-            raise Exception("data must be dict")
-
-        self.logger.emit(label, data)
@@ -7,6 +7,19 @@
 import json
 import time
 
+global_logger = None
+
+def setup(tag, **kwargs):
+    host = kwargs.has_key("host") and kwargs['host'] or 'localhost'
+    port = kwargs.has_key("port") and kwargs['port'] or 24224
+
+    global global_logger
+    global_logger = FluentLogger(tag, host=host, port=port)
+
+def get_global_logger():
+    global global_logger
+    return global_logger
+
 class FluentLogger:
     def __init__(self,
            tag,
@@ -32,9 +45,6 @@ def __init__(self,
             # will be retried in emit()
             self.socket = None
 
-    def __del__(self):
-        self._close()
-
     def emit(self, label, data):
         bytes = self._make_packet(label, data)
         self._send(bytes)
@@ -50,6 +60,7 @@ def _connect(self):
         return sock
 
     def _close(self):
+        print self.socket
         if self.socket:
             self.socket.close()
         self.socket = None
 
@@ -1,14 +1,14 @@
 import unittest
 
 import fluent
-from fluent import Event
+from fluent import event, logger
 
-fluent.setup(server='localhost', tag='app')
+logger.setup(server='localhost', tag='app')
 
 class TestHandler(unittest.TestCase):
     def testLogging(self):
         # send event with tag app.follow
-        Event('follow', {
+        event.Event('follow', {
           'from': 'userA',
           'to':   'userB'
         })