From 1005ea80c4a2dda95b5cd5b7ad3fb5f0a8cb2bba Mon Sep 17 00:00:00 2001
From: Jorrit Schaap <schaap@astron.nl>
Date: Thu, 10 Mar 2016 09:51:31 +0000
Subject: [PATCH] Task #8887: added method stringWithHiddenPassword for safe
logging
---
LCS/PyCommon/dbcredentials.py | 3 +++
SAS/MoM/MoMQueryService/momqueryservice.py | 2 ++
2 files changed, 5 insertions(+)
diff --git a/LCS/PyCommon/dbcredentials.py b/LCS/PyCommon/dbcredentials.py
index 2a449d99901..f1bfa63e3d5 100644
--- a/LCS/PyCommon/dbcredentials.py
+++ b/LCS/PyCommon/dbcredentials.py
@@ -68,6 +68,9 @@ class Credentials:
def __str__(self):
return "type={type} addr={host}:{port} auth={user}:{password} db={database}".format(**self.__dict__)
+ def stringWithHiddenPassword(self):
+ return "type={type} addr={host}:{port} auth={user}:XXXXXX db={database}".format(**self.__dict__)
+
def pg_connect_options(self):
"""
Returns a dict of options to provide to PyGreSQL's pg.connect function. Use:
diff --git a/SAS/MoM/MoMQueryService/momqueryservice.py b/SAS/MoM/MoMQueryService/momqueryservice.py
index a5d73a4cd8c..ca34a124c0e 100755
--- a/SAS/MoM/MoMQueryService/momqueryservice.py
+++ b/SAS/MoM/MoMQueryService/momqueryservice.py
@@ -65,7 +65,9 @@ class MoMDatabaseWrapper:
connect_options = self.dbcreds.mysql_connect_options()
connect_options['connection_timeout'] = 5
try:
+ logger.info("Connecting to %s" % self.dbcreds.stringWithHiddenPassword())
self.conn = connector.connect(**connect_options)
+ logger.info("Connected to %s" % self.dbcreds.stringWithHiddenPassword())
except Exception as e:
logger.error(str(e))
self.conn = None
--
GitLab