From 1a728b96d1781f5200c14f1c83b1d8c1ac3ebae6 Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 19 Sep 2019 13:59:15 +0200
Subject: [PATCH] SW-816: use default dbcreds from disk if none given
---
SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
index 275fc492124..43a7c7674b9 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentDatabase/radb.py
@@ -35,9 +35,14 @@ class RADBError(Exception):
pass
class RADatabase(PostgresDatabaseConnection):
- def __init__(self, dbcreds: dbcredentials.DBCredentials,
+ def __init__(self, dbcreds: dbcredentials.DBCredentials=None,
num_connect_retries: int=5,
connect_retry_interval: float=1.0):
+
+ if dbcreds is None:
+ dbcreds = dbcredentials.DBCredentials().get("RADB")
+ logger.info("Read default RADB dbcreds from disk: %s" % dbcreds.stringWithHiddenPassword())
+
super().__init__(dbcreds=dbcreds,
auto_commit_selects=False,
num_connect_retries=num_connect_retries,
--
GitLab