From 18d31c1e7d652b6f296d55868ccef4d955724e71 Mon Sep 17 00:00:00 2001
From: cymed <102035587+cymed@users.noreply.github.com>
Date: Thu, 19 Dec 2024 15:58:40 +0100
Subject: [PATCH 1/2] Add debug points to database utils

---
 plugin/teksi_wastewater/utils/database_utils.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/plugin/teksi_wastewater/utils/database_utils.py b/plugin/teksi_wastewater/utils/database_utils.py
index ae49987b4..de2b175d6 100644
--- a/plugin/teksi_wastewater/utils/database_utils.py
+++ b/plugin/teksi_wastewater/utils/database_utils.py
@@ -87,10 +87,13 @@ def read_pgservice(service_name):
         # Path for pg_service.conf
         if os.environ.get("PGSERVICEFILE"):
             PG_CONFIG_PATH = os.environ.get("PGSERVICEFILE")
+            logger.debug(f"PGSERVICEFILE:  {PG_CONFIG_PATH}")
         elif os.environ.get("PGSYSCONFDIR"):
             PG_CONFIG_PATH = os.path.join(os.environ.get("PGSYSCONFDIR"), "pg_service.conf")
+            logger.debug(f"PGSYSCONFDIR:  {PG_CONFIG_PATH}")
         else:
             PG_CONFIG_PATH = os.path.expanduser("~/.pg_service.conf")
+            logger.debug(f"PG_CONFIG_PATH:  {PG_CONFIG_PATH}")
 
         config = configparser.ConfigParser()
         if os.path.exists(PG_CONFIG_PATH):
@@ -134,6 +137,8 @@ def get_pgconf_as_psycopg_dsn() -> List[str]:
         parts = []
         for key in pgconf:
             parts.append(f"{key}={pgconf[key]}")
+        dsn_masked_pwd = re.sub(r"(password=).+", r"\1[PASSWORD]", " ".join(parts))
+        logger.debug(f"psycopg dsn: {dsn_masked_pwd}")
         return " ".join(parts)
 
     @staticmethod

From 5934328bdb2bb26849aaf0677b27e5a9f535ee9b Mon Sep 17 00:00:00 2001
From: cymed <102035587+cymed@users.noreply.github.com>
Date: Thu, 19 Dec 2024 16:00:11 +0100
Subject: [PATCH 2/2] import re

---
 plugin/teksi_wastewater/utils/database_utils.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugin/teksi_wastewater/utils/database_utils.py b/plugin/teksi_wastewater/utils/database_utils.py
index de2b175d6..e575ecca3 100644
--- a/plugin/teksi_wastewater/utils/database_utils.py
+++ b/plugin/teksi_wastewater/utils/database_utils.py
@@ -1,6 +1,7 @@
 import collections
 import configparser
 import os
+import re
 from typing import List
 
 from .plugin_utils import logger