From de99f4c2d893e0a5a16519bc4131bf42f1995420 Mon Sep 17 00:00:00 2001 From: Jean-Michel Crepel Date: Thu, 25 Jul 2024 09:58:30 +0200 Subject: [PATCH 1/2] Adding the possibilities of configure env var for db credentials --- .../monitor/monitorPsql/PsqlLogger.java | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/monitor-psql/src/main/java/org/geoserver/monitor/monitorPsql/PsqlLogger.java b/monitor-psql/src/main/java/org/geoserver/monitor/monitorPsql/PsqlLogger.java index 2868917..d59e6e0 100644 --- a/monitor-psql/src/main/java/org/geoserver/monitor/monitorPsql/PsqlLogger.java +++ b/monitor-psql/src/main/java/org/geoserver/monitor/monitorPsql/PsqlLogger.java @@ -60,10 +60,25 @@ private boolean connectToDb() { // connect to database try { - url = props.getProperty("postgres.host"); + if (System.getenv("POSTGRESQL_LOGGING_URL") != null) { + url = System.getenv("POSTGRESQL_LOGGING_URL"); + } else { + url = props.getProperty("postgres.host"); + } conn_prop = new Properties(); - conn_prop.setProperty("user", props.getProperty("postgres.user")); - conn_prop.setProperty("password", props.getProperty("postgres.password")); + + if (System.getenv("POSTGRESQL_LOGGING_USER") != null) { + conn_prop.setProperty("user", System.getenv("POSTGRESQL_LOGGING_USER")); + } else { + conn_prop.setProperty("user", props.getProperty("postgres.user")); + } + + if (System.getenv("POSTGRESQL_LOGGING_PASSWORD") != null) { + conn_prop.setProperty("password", System.getenv("POSTGRESQL_LOGGING_PASSWORD")); + } else { + conn_prop.setProperty("password", props.getProperty("postgres.password")); + } + } catch (Exception e) { LOGGER.log(Level.SEVERE, "Error while reading database connection params", e); return false; From 4418bf196934a228e7a0183c74ea880190bb3589 Mon Sep 17 00:00:00 2001 From: jeanmi <45998535+jeanmi151@users.noreply.github.com> Date: Thu, 25 Jul 2024 10:15:55 +0200 Subject: [PATCH 2/2] Update PsqlLogger.java --- .../main/java/org/geoserver/monitor/monitorPsql/PsqlLogger.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monitor-psql/src/main/java/org/geoserver/monitor/monitorPsql/PsqlLogger.java b/monitor-psql/src/main/java/org/geoserver/monitor/monitorPsql/PsqlLogger.java index d59e6e0..cb795c6 100644 --- a/monitor-psql/src/main/java/org/geoserver/monitor/monitorPsql/PsqlLogger.java +++ b/monitor-psql/src/main/java/org/geoserver/monitor/monitorPsql/PsqlLogger.java @@ -64,7 +64,7 @@ private boolean connectToDb() { url = System.getenv("POSTGRESQL_LOGGING_URL"); } else { url = props.getProperty("postgres.host"); - } + } conn_prop = new Properties(); if (System.getenv("POSTGRESQL_LOGGING_USER") != null) {