From: Aki Tuomi <aki.tuomi@dovecot.fi>
Date: Wed, 12 Sep 2018 07:17:49 +0000 (+0300)
Subject: driver-cassandra: Add error to sql_query_finished event on error
X-Git-Tag: 2.3.4~83
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b8d3831a1c28d635656644f6d7124b87a4f68030;p=thirdparty%2Fdovecot%2Fcore.git

driver-cassandra: Add error to sql_query_finished event on error
---

diff --git a/src/lib-sql/driver-cassandra.c b/src/lib-sql/driver-cassandra.c
index c0fbf95913..1db3206196 100644
--- a/src/lib-sql/driver-cassandra.c
+++ b/src/lib-sql/driver-cassandra.c
@@ -937,9 +937,13 @@ static void driver_cassandra_log_result(struct cassandra_result *result,
 		    timeval_diff_usecs(&now, &result->finish_time),
 		    result->error != NULL ? result->error : "success");
 
-	struct event *event =
+	struct event_passthrough *e =
 		sql_query_finished_event(&db->api, result->api.event,
-					 result->query, FALSE, NULL)->event();
+					 result->query, FALSE, NULL);
+	if (result->error != NULL)
+		e->add_str("error", result->error);
+
+	struct event *event = e->event();
 	if (db->debug_queries)
 		event_set_forced_debug(event, TRUE);
 	if (reply_usecs/1000 >= db->warn_timeout_msecs) {