From 212380c369225459c0d0634d20aa4904a76c6744 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Fri, 8 Mar 2024 14:35:12 +0200 Subject: [PATCH] lib-sql: pgsql - Fix logging database name on connection failure --- src/lib-sql/driver-pgsql.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c index dd6beeca10..3c158acc43 100644 --- a/src/lib-sql/driver-pgsql.c +++ b/src/lib-sql/driver-pgsql.c @@ -255,8 +255,11 @@ static int driver_pgsql_connect(struct sql_db *_db) (void)PQsetNoticeProcessor(db->pg, pgsql_notice_processor, db); if (PQstatus(db->pg) == CONNECTION_BAD) { + const char *name = PQdb(db->pg); + if (name == NULL) + name = db->host; e_error(_db->event, "Connect failed to database %s: %s", - PQdb(db->pg), last_error(db)); + name, last_error(db)); i_free(db->api.last_connect_error); db->api.last_connect_error = i_strdup(last_error(db)); driver_pgsql_close(db); -- 2.47.3