Refactor IRISLogHandler to use logging level constants and update test logging methods to include log level in SQL query

Author: grongierisc

src/iop/_log_manager.py

@@ -41,11 +41,11 @@ def __init__(self, to_console: bool = False):
 
         # Map Python logging levels to IRIS logging methods
         self.level_map = {
-            logging.DEBUG: _iris.get_iris().cls("Ens.Util.Log").LogTrace,
-            logging.INFO: _iris.get_iris().cls("Ens.Util.Log").LogInfo,
-            logging.WARNING: _iris.get_iris().cls("Ens.Util.Log").LogWarning,
-            logging.ERROR: _iris.get_iris().cls("Ens.Util.Log").LogError,
-            logging.CRITICAL: _iris.get_iris().cls("Ens.Util.Log").LogAlert,
+            logging.DEBUG: 5,
+            logging.INFO: 4,
+            logging.WARNING: 3,
+            logging.ERROR: 2,
+            logging.CRITICAL: 6,
         }
         # Map Python logging levels to IRIS logging Console level
         self.level_map_console = {
@@ -79,5 +79,5 @@ def emit(self, record: logging.LogRecord) -> None:
             _iris.get_iris().cls("%SYS.System").WriteToConsoleLog(self.format(record),
                 0,self.level_map_console.get(record.levelno, 0),class_name+"."+method_name)
         else:
-            log_func = self.level_map.get(record.levelno, _iris.get_iris().cls("Ens.Util.Log").LogInfo)
-            log_func(class_name, method_name, self.format(record))
+            log_lvl = self.level_map.get(record.levelno, 4)
+            _iris.get_iris().cls("Ens.Util.Log").Log(log_lvl,class_name, method_name, self.format(record))

src/tests/test_commun.py

@@ -74,16 +74,17 @@ def test_log_info_to_console_from_method(self, common, random_string):
             last_line = file.readlines()[-1]
             assert random_string in last_line
 
-    def _check_log_entry(self, message, method_name):
+    def _check_log_entry(self, message, method_name, level=4):
         sql = """
             SELECT * FROM Ens_Util.Log 
             WHERE SourceClass = '_Common' 
             AND SourceMethod = ? 
             AND Text = ? 
+            AND Type = ?
             ORDER BY id DESC
         """
         stmt = iris.sql.prepare(sql)
-        rs = stmt.execute(method_name, message)
+        rs = stmt.execute(method_name, message, level)
         if rs is None:
             return []
         return rs
@@ -94,6 +95,12 @@ def test_log_info(self, common, random_string):
         for entry in rs:
             assert random_string in entry[9]
 
+    def test_log_warning(self, common, random_string):
+        common.log_warning(random_string)
+        rs = self._check_log_entry(random_string, 'test_log_info', 3)
+        for entry in rs:
+            assert random_string in entry[9]
+
     def test_log_info_japanese(self, common, random_japanese):
         common.log_info(random_japanese)
         rs = self._check_log_entry(random_japanese, 'test_log_info_japanese')