Merge branch 'master' into logging_fix

Dmitriy Gumeniuk · web-flow · commit fe4dc59578ef · 2019-11-11T12:44:13.000+01:00
diff --git a/pytest_reportportal/rp_logging.py b/pytest_reportportal/rp_logging.py
@@ -149,5 +149,7 @@ def makeRecord(self, name, level, fn, lno, msg, args, exc_info,
         yield
 
     finally:
-        logger_class._log = original_log
-        logger_class.makeRecord = original_makeRecord
+        if hasattr(logger_class, '_patched'):
+            logger_class._log = original_log
+            logger_class.makeRecord = original_makeRecord
+            del logger_class._patched
