From b093c4bb898c9b3a02de6f5324a32ec08a4ae25b Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Wed, 12 Sep 2018 10:18:48 +0300 Subject: [PATCH] driver-pgsql: Add error to sql_query_finished if it fails --- src/lib-sql/driver-pgsql.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) 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)->