From 198d6021b412cc6b017e2b626240c183eb7150d9 Mon Sep 17 00:00:00 2001 From: Benjamin Renard Date: Mon, 12 Jul 2021 12:11:38 +0200 Subject: [PATCH] PgDB: fix connect() return and improve logging --- PgDB.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/PgDB.py b/PgDB.py index 6fcc570..5720d67 100644 --- a/PgDB.py +++ b/PgDB.py @@ -25,14 +25,23 @@ class PgDB(object): self.pwd = pwd self.db = db - def connect(self): - if self.con == 0: - try: - con = psycopg2.connect("dbname='%s' user='%s' host='%s' password='%s'" % (self.db,self.user,self.host,self.pwd)) - self.con = con - except Exception: - logging.fatal('An error occured during Postgresql database connection.', exc_info=1) - sys.exit(1) + def connect(self): + if self.con == 0: + try: + con = psycopg2.connect( + dbname=self.db, + user=self.user, + host=self.host, + password=self.pwd + ) + self.con = con + except Exception: + logging.fatal( + 'An error occured during Postgresql database connection (%s@%s, database=%s).', + self.user, self.host, self.db, exc_info=1 + ) + sys.exit(1) + return True def close(self): if self.con: