Update level select logic

Author: HardNorth

reportportal_client/logs/__init__.py

@@ -141,6 +141,16 @@ def filter(self, record):
                 return False
         return True
 
+    def _get_rp_log_level(self, levelno):
+        return next(
+            (
+                self._loglevel_map[level]
+                for level in self._sorted_levelnos
+                if levelno >= level
+            ),
+            self._loglevel_map[logging.NOTSET],
+        )
+
     def emit(self, record):
         """
         Emit function.
@@ -156,18 +166,17 @@ def emit(self, record):
         except Exception:
             self.handleError(record)
 
-        for level in self._sorted_levelnos:
-            if level <= record.levelno:
-                if self.rp_client:
-                    rp_client = self.rp_client
-                else:
-                    rp_client = current()
-                if rp_client:
-                    rp_client.log(
-                        timestamp(),
-                        msg,
-                        level=self._loglevel_map[level],
-                        attachment=record.__dict__.get('attachment', None),
-                        item_id=rp_client.current_item()
-                    )
-                return
+        log_level = self._get_rp_log_level(record.levelno)
+        if self.rp_client:
+            rp_client = self.rp_client
+        else:
+            rp_client = current()
+        if rp_client:
+            rp_client.log(
+                timestamp(),
+                msg,
+                level=log_level,
+                attachment=record.__dict__.get('attachment', None),
+                item_id=rp_client.current_item()
+            )
+        return

tests/logs/test_rp_log_handler.py

@@ -12,9 +12,12 @@
 #  limitations under the License
 import re
 
+# noinspection PyPackageRequirements
 import pytest
+# noinspection PyUnresolvedReferences
 from six.moves import mock
 
+# noinspection PyProtectedMember
 from reportportal_client._local import set_current
 from reportportal_client.logs import RPLogHandler, RPLogger