Merge pull request #6 from NVoronchev/master

Fix and improvement of logging

Author: avarabyeu

pytest_reportportal/__init__.py

@@ -1,8 +1,21 @@
 import logging
+
 from .service import PyTestService
 
 
 class RPlogHandler(logging.Handler):
+
+    # Map loglevel codes from `logging` module to ReportPortal text names:
+    _loglevel_map = {
+        logging.NOTSET: "TRACE",
+        logging.DEBUG: "DEBUG",
+        logging.INFO: "INFO",
+        logging.WARNING: "WARN",
+        logging.ERROR: "ERROR",
+        logging.CRITICAL: "ERROR",
+    }
+    _sorted_levelnos = sorted(_loglevel_map.keys(), reverse=True)
+
     def __init__(self, level=logging.NOTSET):
         super(RPlogHandler, self).__init__(level)
 
@@ -14,4 +27,8 @@ def emit(self, record):
         except:
             self.handleError(record)
 
-        return PyTestService.post_log(msg, log_level=self.level)
+        for level in self._sorted_levelnos:
+            if level <= record.levelno:
+                break
+
+        return PyTestService.post_log(msg, loglevel=self._loglevel_map[level])

pytest_reportportal/service.py

@@ -22,17 +22,12 @@ def __call__(cls, *args, **kwargs):
 
 class PyTestServiceClass(with_metaclass(Singleton, object)):
 
-    def __init__(self):
+    _loglevels = ('TRACE', 'DEBUG', 'INFO', 'WARN', 'ERROR')
 
+    def __init__(self):
         self.RP = None
         self.TEST_ITEM_STACK = []
         self.launch_id = None
-        self.loglevel_map = {
-            0: "TRACE",
-            10: "DEBUG",
-            20: "INFO",
-            30: "WARNING",
-            40: "ERROR"}
 
     def init_service(self, endpoint, project, uuid):
 
@@ -140,10 +135,15 @@ def _get_top_id_from_stack(self):
         except IndexError:
             return None
 
-    def post_log(self, message, log_level="INFO"):
+    def post_log(self, message, loglevel='INFO'):
+        if loglevel not in self._loglevels:
+            logging.warning('Incorrect loglevel = {}. Force set to INFO. Avaliable levels: '
+                            '{}.'.format(loglevel, self._loglevels))
+            loglevel = 'INFO'
+
         sl_rq = SaveLogRQ(item_id=self._get_top_id_from_stack(),
                           time=timestamp(), message=message,
-                          level=self.loglevel_map[log_level])
+                          level=loglevel)
         self.RP.log(sl_rq)