Bumped v0.7.0

vishr · vishr · commit 463337dbbac5 · 2017-09-16T20:56:27.000-07:00
Signed-off-by: Vishal Rana &lt;vr@labstack.com&gt;
diff --git a/labstack/log.py b/labstack/log.py
@@ -8,36 +8,26 @@
 from enum import IntEnum
 import requests
 import arrow
-from apscheduler.schedulers.background import BackgroundScheduler
 from .common import API_URL
 
 class _Log():
   def __init__(self, interceptor):
     self.path = '/log'
     self.interceptor = interceptor
-    self._timer = None
-    self.entries = []
     self.level = Level.INFO
     self.fields = {}
-    self.batch_size = 60
-    self.dispatch_interval = 60
 
     # Automatically report uncaught fatal error
     def excepthook(type, value, trace):
       self.fatal(message=str(value), stack_trace=''.join(traceback.format_tb(trace)))
       sys.__excepthook__(type, value, trace)
     sys.excepthook = excepthook
 
-  def _dispatch(self):
-    if len(self.entries) == 0:
-      return
-    try:
-      r = requests.post(API_URL + self.path, auth=self.interceptor, data=json.dumps(self.entries))
-      if not 200 <= r.status_code < 300:
-        data = r.json()
-        raise LogError(data['code'], data['message'])
-    finally:
-      self.entries.clear()
+  def _dispatch(self, entry):
+    r = requests.post(API_URL + self.path, auth=self.interceptor, data=json.dumps(entry))
+    if not 200 <= r.status_code < 300:
+      data = r.json()
+      raise LogError(data['code'], data['message'])
 
   def add_fields(self, **kwargs):
     self.fields.update(kwargs)
@@ -60,23 +50,14 @@ def fatal(self, **kwargs):
   def _log(self, level, **kwargs):
     if level < self.level:
       return
-
-    if self._timer is None:
-      self.timer = BackgroundScheduler()
-      self.timer.add_job(self._dispatch, 'interval', seconds=self.dispatch_interval)
-      self.timer.start()
     
     kwargs['time'] = arrow.now().format('YYYY-MM-DDTHH:mm:ss.SSSZ')
-    for k, v in self.fields.items():
-      kwargs[k]  = v
     kwargs['level'] = level.name
-    self.entries.append(kwargs)
 
-    if level == Level.FATAL or len(self.entries) >= self.batch_size:
-      try:
-        self._dispatch()
-      except LogError as err:
-        print('log error: code={}, message={}'.format(err.code, err.message))
+    try:
+      self._dispatch(kwargs)
+    except LogError as err:
+      print('log error: code={}, message={}'.format(err.code, err.message))
 
 class Level(IntEnum):
   DEBUG = 0
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
   name='labstack',
-  version='0.6.7',
+  version='0.7.0',
   description='Official Python client library for the LabStack platform',
   long_description='`<https://github.com/labstack/labstack-python>`_',
   keywords='labstack cube email log mqtt store',
@@ -12,7 +12,6 @@
   license='MIT',
   packages=['labstack'],
   install_requires=[
-    'apscheduler==3.3.1',
     'arrow==0.10.0',
     'paho-mqtt==1.3.0',
     'requests==2.18.1'
