move logger into utils.py

2 files changed, 27 insertions, 38 deletions

diff --git a/gdpr_obfuscator/logger.py b/gdpr_obfuscator/logger.py
index fe97210..8b13789 100644
--- a/gdpr_obfuscator/logger.py
+++ b/gdpr_obfuscator/logger.py
@@ -1,35 +1 @@
-import logging
-from enum import Enum
 
-
-class LogLevel(Enum):
-    DEBUG = logging.DEBUG
-    INFO = logging.INFO
-    WARNING = logging.WARNING
-    ERROR = logging.ERROR
-    CRITICAL = logging.CRITICAL
-
-
-def get_logger(name: str, level: LogLevel = LogLevel.INFO) -> logging.Logger:
-    if isinstance(level, str):
-        try:
-            level = LogLevel[level.upper()]
-        except KeyError:
-            raise ValueError(
-                f"Invalid log level '{level}'. Choose from: {', '.join(l.name for l in LogLevel)}"
-            )
-
-    logger = logging.getLogger(name)
-
-    if logger.hasHandlers():
-        logger.handlers.clear()
-
-    handler = logging.StreamHandler()
-    logger.setLevel(level.value)
-    formatting = logging.Formatter(
-        "[%(asctime)s] - %(levelname)s::%(name)s - %(message)s"
-    )
-    handler.setFormatter(formatting)
-    logger.addHandler(handler)
-
-    return logger
diff --git a/gdpr_obfuscator/utils.py b/gdpr_obfuscator/utils.py
index 2dffbc2..fe0ef42 100644
--- a/gdpr_obfuscator/utils.py
+++ b/gdpr_obfuscator/utils.py
@@ -1,13 +1,36 @@
-# Utility functions
-from .logger import get_logger
-from typing import List, Dict
 import csv
 import io
+import logging
+import Enum
+from typing import List, Dict
 
 
 class Utilities:
+    class LogLevel(Enum):
+        DEBUG = logging.DEBUG
+        INFO = logging.INFO
+        WARNING = logging.WARNING
+        ERROR = logging.ERROR
+        CRITICAL = logging.CRITICAL
+
+    @staticmethod
+    def get_logger(name: str, level: "Utilities.LogLevel" = None) -> logging.Logger:
+        level = level or Utilities.LogLevel.INFO
+        logger = logging.getLogger(name)
+        if logger.hasHandlers():
+            logger.handlers.clear()
+
+        handler = logging.StreamHandler()
+        logger.setLevel(level.value)
+        formatter = logging.Formatter(
+            "[%(asctime)s] - %(levelname)s::%(name)s - %(message)s"
+        )
+        handler.setFormatter(formatter)
+        logger.addHandler(handler)
+        return logger
+
     def __init__(self, logger=None):
-        self.logger = get_logger("UTILITIES", logger)
+        self.logger = self.get_logger(__name__, logger)
 
     def get_s3_path(self, uri):
         parts = uri.replace("s3://", "").split("/")