Merge pull request #91 from CCPBioSim/89-refine-output-log-generation

Refinements made to the logging outputs as mentioned in issue #89:

Author: harryswift01

CodeEntropy/config/logging_config.py

@@ -38,12 +38,12 @@ def __init__(self, folder, log_level=logging.INFO):
                     "class": "logging.FileHandler",
                     "filename": os.path.join(log_directory, "program.log"),
                     "formatter": "detailed",
-                    "level": logging.DEBUG,
+                    "level": log_level,
                 },
                 "errorfile": {
                     "class": "logging.FileHandler",
                     "filename": os.path.join(log_directory, "program.err"),
-                    "formatter": "detailed",
+                    "formatter": "simple",
                     "level": logging.ERROR,
                 },
                 "commandfile": {
@@ -56,7 +56,7 @@ def __init__(self, folder, log_level=logging.INFO):
                     "class": "logging.FileHandler",
                     "filename": os.path.join(log_directory, "mdanalysis.log"),
                     "formatter": "detailed",
-                    "level": logging.DEBUG,
+                    "level": log_level,
                 },
             },
             "loggers": {
@@ -66,7 +66,7 @@ def __init__(self, folder, log_level=logging.INFO):
                 },
                 "MDAnalysis": {
                     "handlers": ["mdanalysis_log"],
-                    "level": logging.DEBUG,
+                    "level": log_level,
                     "propagate": False,
                 },
                 "commands": {
@@ -88,17 +88,17 @@ def update_logging_level(self, log_level):
         root_logger = logging.getLogger()
         root_logger.setLevel(log_level)
         for handler in root_logger.handlers:
-            if isinstance(handler, logging.FileHandler):
-                handler.setLevel(logging.DEBUG)
-            else:
-                handler.setLevel(logging.INFO)
+            handler.setLevel(
+                log_level if isinstance(handler, logging.FileHandler) else logging.INFO
+            )
 
         # Update all other loggers and their handlers
         for logger_name in self.LOGGING["loggers"]:
             logger = logging.getLogger(logger_name)
             logger.setLevel(log_level)
             for handler in logger.handlers:
-                if isinstance(handler, logging.FileHandler):
-                    handler.setLevel(logging.DEBUG)
-                else:
-                    handler.setLevel(logging.INFO)
+                handler.setLevel(
+                    log_level
+                    if isinstance(handler, logging.FileHandler)
+                    else logging.INFO
+                )

tests/test_CodeEntropy/test_logging_config.py

@@ -65,11 +65,17 @@ def test_update_logging_level(self):
         self.assertEqual(root_logger.level, logging.INFO)
 
     def test_mdanalysis_and_command_loggers_exist(self):
-        """Ensure specialized loggers are set up"""
+        """Ensure specialized loggers are set up with correct configuration"""
+        log_level = logging.DEBUG
+        self.logging_config = LoggingConfig(
+            folder=self.temp_dir.name, log_level=log_level
+        )
         self.logging_config.setup_logging()
+
         mda_logger = logging.getLogger("MDAnalysis")
         cmd_logger = logging.getLogger("commands")
-        self.assertEqual(mda_logger.level, logging.DEBUG)
+
+        self.assertEqual(mda_logger.level, log_level)
         self.assertEqual(cmd_logger.level, logging.INFO)
         self.assertFalse(mda_logger.propagate)
         self.assertFalse(cmd_logger.propagate)