Fix patching of non-RP loggers

Author: Ivan Ivanou

README.rst

@@ -95,6 +95,14 @@ in conftest.py:
 
 .. code-block:: python
 
+    import logging
+    import sys
+
+    import pytest
+
+    from pytest_reportportal import RPLogger, RPLogHandler
+
+
     @pytest.fixture(scope="session")
     def rp_logger(request):
         import logging
@@ -104,11 +112,13 @@ in conftest.py:
         # configured and started.
         if hasattr(request.node.config, 'py_test_service'):
             # Import Report Portal logger and handler to the test module.
-            from pytest_reportportal import RPLogger, RPLogHandler
             logging.setLoggerClass(RPLogger)
             rp_handler = RPLogHandler(request.node.config.py_test_service)
+            # Add additional handlers if it is necessary
+            console_handler = logging.StreamHandler(sys.stdout)
+            console_handler.setLevel(logging.INFO)
+            logger.addHandler(console_handler)
         else:
-            import sys
             rp_handler = logging.StreamHandler(sys.stdout)
         # Set INFO level for Report Portal handler.
         rp_handler.setLevel(logging.INFO)

pytest_reportportal/rp_logging.py

@@ -142,14 +142,14 @@ def makeRecord(self, name, level, fn, lno, msg, args, exc_info,
                 return record
             return makeRecord
 
-        if not logger_class == RPLogger and not hasattr(logger_class, "_patched"):
+        if not issubclass(logger_class, RPLogger):
             logger_class._log = wrap_log(logger_class._log)
             logger_class.makeRecord = wrap_makeRecord(logger_class.makeRecord)
-            logger_class._patched = True
+            logging.setLoggerClass(RPLogger)
         yield
 
     finally:
-        if hasattr(logger_class, '_patched'):
+        if not issubclass(logger_class, RPLogger):
             logger_class._log = original_log
             logger_class.makeRecord = original_makeRecord
-            del logger_class._patched
+            logging.setLoggerClass(logger_class)