Bumped v0.3.0

vishr · vishr · commit 972b06120626 · 2017-07-21T18:58:02.000-07:00
Signed-off-by: Vishal Rana &lt;vr@labstack.com&gt;
diff --git a/Makefile b/Makefile
@@ -1,3 +1,4 @@
 publish:
+	rm -rf dist
 	python setup.py sdist bdist_wheel
-	twine upload dist/*
+	twine upload dist/*
diff --git a/labstack/__init__.py b/labstack/__init__.py
@@ -1,4 +1,4 @@
 from .client import Client
 from .email import EmailMessage, EmailError
-from .log  import LEVEL_DEBUG, LEVEL_INFO, LEVEL_WARN, LEVEL_ERROR, LEVEL_FATAL, LEVEL_OFF, LogError
+from .log  import Level, LogError
 from .store import StoreError
diff --git a/labstack/log.py b/labstack/log.py
@@ -3,26 +3,12 @@
 import json
 import time
 import threading
+from enum import IntEnum
 import asyncio
 import requests
 import arrow
 from .common import API_URL
 
-LEVEL_DEBUG = 0
-LEVEL_INFO = 1
-LEVEL_WARN = 2
-LEVEL_ERROR = 3
-LEVEL_FATAL = 4
-LEVEL_OFF = 5
-
-levels = {
-	LEVEL_DEBUG: "DEBUG",
-	LEVEL_INFO:  "INFO",
-	LEVEL_WARN:  "WARN",
-	LEVEL_ERROR: "ERROR",
-	LEVEL_FATAL: "FATAL",
-}
-
 class _Log():
   def __init__(self, interceptor):
     self.path = '/log'
@@ -32,7 +18,7 @@ def __init__(self, interceptor):
     self.app_id = ''
     self.app_name = '' 
     self.tags = []
-    self.level = LEVEL_INFO
+    self.level = Level.INFO
     self.batch_size = 60
     self.dispatch_interval = 60
 
@@ -52,19 +38,19 @@ async def _dispatch(self):
     self.entries.clear()
 
   def debug(self, format, *argv):
-    self._log(LEVEL_DEBUG, format, *argv)
+    self._log(Level.DEBUG, format, *argv)
 
   def info(self, format, *argv):
-    self._log(LEVEL_INFO, format, *argv)
+    self._log(Level.INFO, format, *argv)
     
   def warn(self, format, *argv):
-    self._log(LEVEL_WARN, format, *argv)
+    self._log(Level.WARN, format, *argv)
   
   def error(self, format, *argv):
-    self._log(LEVEL_ERROR, format, *argv)
+    self._log(Level.ERROR, format, *argv)
     
   def fatal(self, format, *argv):
-    self._log(LEVEL_FATAL, format, *argv)
+    self._log(Level.FATAL, format, *argv)
 
   def _log(self, level, format, *argv):
     if level < self.level:
@@ -82,7 +68,7 @@ def _log(self, level, format, *argv):
 		  'app_id': self.app_id,
 		  'app_name': self.app_name,
 		  'tags': self.tags,
-		  'level': levels[level],
+		  'level': level.name,
 		  'message': message,
     })
 
@@ -91,6 +77,14 @@ def _log(self, level, format, *argv):
         self._dispatch()
       except LogError as err:
         print(err)
+
+class Level(IntEnum):
+  DEBUG = 0
+  INFO = 1
+  WARN = 2
+  ERROR = 3
+  FATAL = 4
+  OFF = 5
     
 class LogError(Exception):
   def __init__(self, code, message):
@@ -99,4 +93,3 @@ def __init__(self, code, message):
 
   def __str__(self):
     return 'log error, code={0}, message={1}'.format(self.code, self.message)
-  
diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
   name='labstack',
-  version='0.2.0',
+  version='0.3.0',
   description='Official Python client library for the LabStack REST API',
   long_description='`<https://github.com/labstack/labstack-python>`_',
   keywords='labstack cube email log mqtt store',
