chore: setting default logging as json format

Signed-off-by: Caleb Siebach <caleb@indicio.tech>

Author: whyriod

Dockerfile

@@ -19,5 +19,6 @@ COPY --from=base /usr/src/app/.venv /usr/src/app/.venv
 ENV PATH="/usr/src/app/.venv/bin:$PATH"
 
 COPY socketdock socketdock
+COPY socketdock/config/jsonLog.py /usr/local/lib/python3.9/jsonLog.py
 
 ENTRYPOINT ["python",  "-m", "socketdock" ]

socketdock/__main__.py

@@ -12,12 +12,15 @@ def configure_logging(args):
     # Set up logging
     log_config = args.log_config
     log_level = args.log_level
-    log_file = args.log_file
-    LoggingConfigurator.configure(
-        log_config_path=log_config,
-        log_level=log_level,
-        log_file=log_file,
-    )
+
+    try:
+        LoggingConfigurator.configure(
+            log_config_path=log_config,
+            log_level=log_level,
+        )
+
+    except Exception as e:
+        raise Exception("Logger configuration failed: ", e)
 
 
 def config() -> argparse.Namespace:
@@ -38,20 +41,10 @@ def config() -> argparse.Namespace:
         default="INFO",
         choices=["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"],
     )
-    parser.add_argument(
-        "--log-file",
-        dest="log_file",
-        default=None,
-        help=(
-            "--log-file enables writing of logs to file, if a value is "
-            "provided then it uses that as log file location, otherwise "
-            "the default location in log config file is used."
-        ),
-    )
     parser.add_argument(
         "--log-config",
         dest="log_config",
-        default=None,
+        default="/usr/src/app/socketdock/config/logging-config.yml",
         help="Specifies a custom logging configuration file",
     )
 

socketdock/loadlogger.py

@@ -1,11 +1,9 @@
-"""Logging Configurator for aca-py agent."""
+"""Logging Configurator for tails server."""
 
 import io
 import logging
 from importlib import resources
-from logging.config import (
-    dictConfigClass,
-)
+from logging.config import dictConfigClass
 from typing import Optional
 
 import yaml
@@ -53,60 +51,37 @@ class LoggingConfigurator:
 
     @classmethod
     def configure(
-        cls,
-        log_config_path: Optional[str] = None,
-        log_level: Optional[str] = None,
-        log_file: Optional[str] = None,
+        cls, log_config_path: Optional[str] = None, log_level: Optional[str] = None
     ):
         """Configure logger.
 
         :param logging_config_path: str: (Default value = None) Optional path to
             custom logging config
 
         :param log_level: str: (Default value = None)
-
-        :param log_file: str: (Default value = None) Optional file name to write logs to
         """
 
-        write_to_log_file = log_file is not None or log_file == ""
-
-        # This is a check that requires a log file path to be provided if
-        # --log-file is specified on startup and a config file is not.
-        if not log_config_path and write_to_log_file and not log_file:
-            raise ValueError(
-                "log_file (--log-file) must be provided in single-tenant mode "
-                "using the default config since a log file path is not set."
-            )
-
-        cls._configure_logging(
-            log_config_path=log_config_path,
-            log_level=log_level,
-            log_file=log_file,
-        )
+        cls._configure_logging(log_config_path=log_config_path, log_level=log_level)
 
     @classmethod
-    def _configure_logging(cls, log_config_path, log_level, log_file):
+    def _configure_logging(cls, log_config_path, log_level):
         # Setup log config and log file if provided
-        cls._setup_log_config_file(log_config_path, log_file)
-
-        # Set custom file handler
-        if log_file:
-            logging.root.handlers.append(logging.FileHandler(log_file, encoding="utf-8"))
+        cls._setup_log_config_file(log_config_path)
 
         # Set custom log level
         if log_level:
             logging.root.setLevel(log_level.upper())
 
     @classmethod
-    def _setup_log_config_file(cls, log_config_path, log_file):
+    def _setup_log_config_file(cls, log_config_path):
         log_config, is_dict_config = cls._load_log_config(log_config_path)
 
         # Setup config
         if not log_config:
             logging.basicConfig(level=logging.WARNING)
             logging.root.warning(f"Logging config file not found: {log_config_path}")
         elif is_dict_config:
-            dictConfig(log_config, new_file_path=log_file or None)
+            dictConfig(log_config)
 
     @classmethod
     def _load_log_config(cls, log_config_path):