inline set_log_level, add tests for logging config

Author: Artem Krivonos

awslambdaric/bootstrap.py

@@ -385,12 +385,8 @@ def __enter__(self):
     def __exit__(self, exc_type, exc_value, exc_tb):
         self.file.close()
 
-    def set_log_level(self, frame_type, log_level):
-        mask = self.LEVEL_TO_MASK.get(log_level, self.DEFAULT_LEVEL_MASK)
-        return frame_type | mask
-
     def log(self, msg, log_level=logging.NOTSET, log_format=LambdaLogFormat.TEXT):
-        frame_type = self.set_log_level(self.frame_type, log_level)
+        frame_type = self.frame_type | self.LEVEL_TO_MASK.get(log_level, self.DEFAULT_LEVEL_MASK)
         frame_type = frame_type | log_format
 
         encoded_msg = msg.encode("utf8")

tests/test_bootstrap.py

@@ -5,6 +5,7 @@
 import importlib
 import json
 import logging
+import logging.config
 import os
 import re
 import tempfile
@@ -1354,7 +1355,6 @@ def test_log_level(self, mock_stderr, mock_stdout):
         logger.debug("debug message")
         logger.info("info message")
 
-        # print("some ", mock_stdout.getvalue())
         data = json.loads(mock_stdout.getvalue())
         data.pop("timestamp")
 
@@ -1369,6 +1369,77 @@ def test_log_level(self, mock_stderr, mock_stdout):
         )
         self.assertEqual(mock_stderr.getvalue(), "")
 
+    @patch("sys.stdout", new_callable=StringIO)
+    @patch("sys.stderr", new_callable=StringIO)
+    def test_set_log_level_manually(self, mock_stderr, mock_stdout):
+        logger = logging.getLogger("test.logger")
+
+        # Changing log level after `bootstrap.setup_logging`
+        logging.getLogger().setLevel(logging.FATAL)
+
+        logger.debug("debug message")
+        logger.info("info message")
+        logger.warning("warning message")
+        logger.error("error message")
+        logger.fatal("fatal message")
+
+        data = json.loads(mock_stdout.getvalue())
+        data.pop("timestamp")
+
+        self.assertEqual(
+            data,
+            {
+                "level": "FATAL",
+                "logger": "test.logger",
+                "message": "fatal message",
+                "requestId": "",
+            },
+        )
+        self.assertEqual(mock_stderr.getvalue(), "")
+
+
+    @patch("sys.stdout", new_callable=StringIO)
+    @patch("sys.stderr", new_callable=StringIO)
+    def test_set_log_level_with_dictConfig(self, mock_stderr, mock_stdout):
+        # Changing log level after `bootstrap.setup_logging`
+        logging.config.dictConfig(
+            {
+                "version": 1,
+                "disable_existing_loggers": False,
+                "formatters": {
+                    "simple": {
+                        "format": "%(levelname)-8s - %(message)s"
+                    }
+                },
+                "handlers": {
+                    "stdout": {
+                        "class": "logging.StreamHandler",
+                        "formatter": "simple",
+                    },
+                },
+                "root": {
+                    "level": "FATAL",
+                    "handlers": [
+                        "stdout",
+                    ]
+                }
+            }
+        )
+
+        logger = logging.getLogger("test.logger")
+        logger.debug("debug message")
+        logger.info("info message")
+        logger.warning("warning message")
+        logger.error("error message")
+        logger.fatal("fatal message")
+
+        data = mock_stderr.getvalue()
+        self.assertEqual(
+            data,
+            'FATAL    - fatal message\n',
+        )
+        self.assertEqual(mock_stdout.getvalue(), "")
+
 
 class TestBootstrapModule(unittest.TestCase):
     @patch("awslambdaric.bootstrap.handle_event_request")