From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Wed, 12 Sep 2018 07:18:48 +0000 (+0300)
Subject: driver-pgsql: Add error to sql_query_finished if it fails
X-Git-Tag: 2.3.9~1407
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c59375cf2db8c0de93b135b2d71b8305388307f6;p=thirdparty%2Fdovecot%2Fcore.git

driver-pgsql: Add error to sql_query_finished if it fails
---

diff --git a/src/lib-sql/driver-pgsql.c b/src/lib-sql/driver-pgsql.c
index ddc58e337a..ab0d2ea0c3 100644
--- a/src/lib-sql/driver-pgsql.c
+++ b/src/lib-sql/driver-pgsql.c
@@ -422,11 +422,13 @@ static void result_finish(struct pgsql_result *result)
 
 	/* emit event */
 	if (result->api.failed) {
-		e_debug(sql_query_finished_event(&db->api, result->api.event,
-						 result->query, TRUE, &duration)->
-						 event(),
-			SQL_QUERY_FINISHED_FMT": %s", result->query,
-			duration, result->timeout ? "Timed out" : last_error(db));
+		const char *error = result->timeout ? "Timed out" : last_error(db);
+		struct event_passthrough *e =
+			sql_query_finished_event(&db->api, result->api.event,
+						 result->query, TRUE, &duration);
+		e->add_str("error", error);
+		e_debug(e->event(), SQL_QUERY_FINISHED_FMT": %s", result->query,
+			duration, error);
 	} else {
 		e_debug(sql_query_finished_event(&db->api, result->api.event,
 						 result->query, FALSE, &duration)->