Prefix all logging messages with "kdcproxy:"

When running kdcproxy in mod_wsgi, it is unclear from which component error messages come from. For example: mod_wsgi.c(): [client WARNING:root:Connection broken while writing (...) Prefixing all logging messages with "kdcproxy:" solves this. Signed-off-by: François Cami <[email protected]>
latchset · Mar 22, 2024 · 54ccbb8 · 54ccbb8
1 parent 0148b1c
commit 54ccbb8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/kdcproxy/__init__.py b/kdcproxy/__init__.py
@@ -101,7 +101,8 @@ def __await_reply(self, pr, rsocks, wsocks, timeout):
                         sock.sendall(pr.request)
                         extra = 10  # New connections get 10 extra seconds
                 except Exception as e:
-                    logging.warning("Connection broken while writing (%s)", e)
+                    logging.warning(
+                        "kdcproxy: Connection broken while writing (%s)", e)
                     continue
                 rsocks.append(sock)
                 wsocks.remove(sock)
@@ -110,7 +111,8 @@ def __await_reply(self, pr, rsocks, wsocks, timeout):
                 try:
                     reply = self.__handle_recv(sock, read_buffers)
                 except Exception as e:
-                    logging.warning("Connection broken while reading (%s)", e)
+                    logging.warning(
+                        "kdcproxy: Connection broken while reading (%s)", e)
                     if self.sock_type(sock) == socket.SOCK_STREAM:
                         # Remove broken TCP socket from readers
                         rsocks.remove(sock)

diff --git a/kdcproxy/config/__init__.py b/kdcproxy/config/__init__.py
@@ -60,14 +60,16 @@ def __init__(self, filenames=None):
         try:
             self.__cp.read(filenames)
         except configparser.Error:
-            logging.error("Unable to read config file(s): %s", filenames)
+            logging.error("kdcproxy: Unable to read config file(s): %s",
+                          filenames)
 
         try:
             mod = self.__cp.get(self.GLOBAL, "configs")
             try:
                 importlib.import_module("kdcproxy.config." + mod)
             except ImportError as e:
-                logging.log(logging.ERROR, "Error reading config: %s" % e)
+                logging.log(logging.ERROR,
+                            "kdcproxy: Error reading config: %s" % e)
         except configparser.Error:
             pass
 
@@ -134,7 +136,7 @@ def __init__(self):
             except Exception as e:
                 fmt = (allsub[i], repr(e))
                 logging.log(logging.WARNING,
-                            "Error instantiating %s due to %s" % fmt)
+                            "kdcproxy: Error instantiating %s due to %s" % fmt)
         assert self.__resolvers
 
         # See if we should use DNS