Merge pull request #993 from nofusscomputing/development

Author: jon-nfc

app/api/auth.py

@@ -1,21 +1,22 @@
 import datetime
 
 from django.conf import settings
-from logging import Logger
 
 from rest_framework import exceptions
 from rest_framework.authentication import BaseAuthentication, get_authorization_header
 
 from api.models.tokens import AuthToken
 
+from centurion.logging import CenturionLogger
+
 # scheme.py
 from drf_spectacular.extensions import OpenApiAuthenticationExtension
 
 class TokenScheme(OpenApiAuthenticationExtension):
     target_class = "api.auth.TokenAuthentication"
     name = "TokenAuthentication"
 
-    def get_security_definition(self, auto_schema):        
+    def get_security_definition(self, auto_schema):
         return {
             "type": "apiKey",
             "in": "header",
@@ -52,7 +53,7 @@ def authenticate(self, request):
 
         auth = get_authorization_header(request).split()
 
-        log: Logger = settings.CENTURION_LOG.getChild('authentication')
+        log: CenturionLogger = settings.CENTURION_LOG.getChild('authentication')
 
         if not auth:
             return None

app/api/viewsets/common/common.py

@@ -1,6 +1,5 @@
 import django
 import importlib
-import logging
 import rest_framework
 
 from django.conf import settings
@@ -11,6 +10,7 @@
 from rest_framework.response import Response
 from rest_framework import viewsets
 
+from centurion.logging import CenturionLogger
 from core.mixins.centurion import Centurion
 
 from api.permissions.default import DefaultDenyPermission
@@ -615,7 +615,7 @@ def allowed_methods(self):
     _Optional_, if specified will be add to list view metadata
     """
 
-    _log: logging.Logger = None
+    _log: CenturionLogger = None
 
     def get_log(self):
 

app/centurion/logging.py

@@ -0,0 +1,99 @@
+import logging
+import logging.handlers
+
+
+
+class CenturionLogger(logging.Logger):
+
+    EMERG    = 90
+    ALERT    = 80
+    CRITICAL = 70
+    ERROR    = 60
+    WARNING  = 50
+    WARN     = WARNING
+    NOTICE   = 40
+    INFO     = 30
+    DEBUG    = 20
+    TRACE    = 10
+    NOTSET = logging.NOTSET
+
+    _levelToName = {
+        EMERG:    "EMERG",
+        ALERT:    "ALERT",
+        CRITICAL: "CRITICAL",
+        ERROR:    "ERROR",
+        WARNING:  "WARNING",
+        NOTICE:   "NOTICE",
+        INFO:     "INFO",
+        DEBUG:    "DEBUG",
+        TRACE:    "TRACE",
+        NOTSET:   "NOTSET",
+    }
+
+    _nameToLevel = {name: level for level, name in _levelToName.items()}
+
+    def __init__(self, name, level=DEBUG, address="/dev/log"):
+        super().__init__(name, level)
+
+        # Attach SysLogHandler
+        handler = logging.handlers.SysLogHandler(address=address)
+        handler.priority_map.update({
+            "EMERG":    "emerg",
+            "ALERT":    "alert",
+            "CRITICAL": "crit",
+            "ERROR":    "err",
+            "WARNING":  "warning",
+            "NOTICE":   "notice",
+            "INFO":     "info",
+            "DEBUG":    "debug",
+            "TRACE":    "debug",
+        })
+
+        # Use a custom Formatter that maps numeric levels to names from this instance only
+        formatter = logging.Formatter(fmt="%(levelname)s: %(message)s")
+        formatter.format = lambda record: self._levelToName.get(record.levelno, record.levelno) + ": " + record.getMessage()
+        handler.setFormatter(formatter)
+
+        self.addHandler(handler)
+
+    # --- Override base class methods ---
+    def critical(self, msg, *args, **kwargs):
+        if self.isEnabledFor(self.CRITICAL):
+            self._log(self.CRITICAL, msg, args, **kwargs)
+
+    def error(self, msg, *args, **kwargs):
+        if self.isEnabledFor(self.ERROR):
+            self._log(self.ERROR, msg, args, **kwargs)
+
+    def warning(self, msg, *args, **kwargs):
+        if self.isEnabledFor(self.WARNING):
+            self._log(self.WARNING, msg, args, **kwargs)
+
+    def info(self, msg, *args, **kwargs):
+        if self.isEnabledFor(self.INFO):
+            self._log(self.INFO, msg, args, **kwargs)
+
+    def debug(self, msg, *args, **kwargs):
+        if self.isEnabledFor(self.DEBUG):
+            self._log(self.DEBUG, msg, args, **kwargs)
+
+    # --- Additional syslog levels ---
+    def emergency(self, msg, *args, **kwargs):
+        if self.isEnabledFor(self.EMERG):
+            self._log(self.EMERG, msg, args, **kwargs)
+
+    def alert(self, msg, *args, **kwargs):
+        if self.isEnabledFor(self.ALERT):
+            self._log(self.ALERT, msg, args, **kwargs)
+
+    def notice(self, msg, *args, **kwargs):
+        if self.isEnabledFor(self.NOTICE):
+            self._log(self.NOTICE, msg, args, **kwargs)
+
+    def makeRecord(
+        self, name, level, fn, lno, msg, args, exc_info, func=None, extra=None, sinfo=None
+    ):
+        record = super().makeRecord(name, level, fn, lno, msg, args, exc_info, func, extra, sinfo)
+        # Override record.levelname from instance _levelToName
+        record.levelname = self._levelToName.get(record.levelno, str(record.levelno))
+        return record