Not logging correct IP yet

argocd/configmap.yaml

@@ -19,4 +19,4 @@ data:
   LOGOUT_REDIRECT_URL: "login"
   TRUSTED_PROXIES: "192.168.17.44,192.168.17.53"
   GUNICORN_OPTS: "--access-logfile -"
-  IMAGE_TAG: "0.070"
+  IMAGE_TAG: "0.071"

argocd/deployment.yaml

@@ -27,7 +27,7 @@ spec:
               mountPath: /data
       containers:
         - name: web
-          image: git.baumann.gr/adebaumann/labhelper:0.070
+          image: git.baumann.gr/adebaumann/labhelper:0.071
           imagePullPolicy: Always
           ports:
             - containerPort: 8000

gunicorn.conf.py

@@ -17,6 +17,10 @@ class HealthCheckFilter(logging.Filter):
 
 
 class CustomLogger(Logger):
+    def setup(self, cfg):
+        super().setup(cfg)
+        self.access_log.addFilter(HealthCheckFilter())
+
     def atoms(self, resp, req, environ, request_time):
         atoms = super().atoms(resp, req, environ, request_time)
         atoms["{client-ip}e"] = self._get_client_ip(environ)
@@ -39,40 +43,3 @@ class CustomLogger(Logger):
 
 logger_class = CustomLogger
 access_log_format = '%({client-ip}e)s %(l)s %(u)s %(t)s "%(r)s" %(s)s %(b)s "%(f)s" "%(a)s"'
-
-logconfig_dict = {
-    "version": 1,
-    "disable_existing_loggers": False,
-    "filters": {
-        "health_check": {
-            "()": HealthCheckFilter,
-        },
-    },
-    "handlers": {
-        "console": {
-            "class": "logging.StreamHandler",
-            "stream": "ext://sys.stderr",
-        },
-        "access_console": {
-            "class": "logging.StreamHandler",
-            "filters": ["health_check"],
-            "stream": "ext://sys.stdout",
-        },
-    },
-    "root": {
-        "level": "INFO",
-        "handlers": ["console"],
-    },
-    "loggers": {
-        "gunicorn.error": {
-            "level": "INFO",
-            "handlers": ["console"],
-            "propagate": False,
-        },
-        "gunicorn.access": {
-            "level": "INFO",
-            "handlers": ["access_console"],
-            "propagate": False,
-        },
-    },
-}