From: Aki Tuomi <aki.tuomi@open-xchange.com>
Date: Mon, 31 May 2021 11:48:42 +0000 (+0300)
Subject: plugins/fts: Use event logging
X-Git-Tag: 2.3.16~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8609b88e86ccfcdf9740f0e4ebb247a7c335f56b;p=thirdparty%2Fdovecot%2Fcore.git

plugins/fts: Use event logging
---

diff --git a/src/plugins/fts/fts-indexer.c b/src/plugins/fts/fts-indexer.c
index 1e30274b1e..4fbefb0e6b 100644
--- a/src/plugins/fts/fts-indexer.c
+++ b/src/plugins/fts/fts-indexer.c
@@ -142,22 +142,22 @@ fts_indexer_input_args(struct connection *conn, const char *const *args)
 		container_of(conn, struct fts_indexer_context, conn);
 	int percentage;
 	if (args[1] == NULL) {
-		i_error("indexer sent invalid reply");
+		e_error(conn->event, "indexer sent invalid reply");
 		return -1;
 	}
 	if (strcmp(args[0], "1") != 0) {
-		i_error("indexer sent invalid reply");
+		e_error(conn->event, "indexer sent invalid reply");
 		return -1;
 	}
 	if (strcmp(args[1], "OK") == 0)
 		return 1;
 	if (str_to_int(args[1], &percentage) < 0) {
-		i_error("indexer sent invalid progress: %s", args[1]);
+		e_error(conn->event, "indexer sent invalid progress: %s", args[1]);
 		ctx->failed = TRUE;
 		return -1;
 	}
 	if (percentage < 0) {
-		i_error("indexer failed to index mailbox %s", ctx->box->vname);
+		e_error(ctx->box->event, "indexer failed to index mailbox");
 		ctx->failed = TRUE;
 		return -1;
 	}
@@ -228,7 +228,9 @@ int fts_indexer_init(struct fts_backend *backend, struct mailbox *box,
 	value = mail_user_plugin_getenv(box->storage->user, "fts_index_timeout");
 	if (value != NULL) {
 		if (settings_get_time(value, &timeout_secs, &error) < 0)
-			i_error("Invalid fts_index_timeout setting: %s", error);
+			e_error(box->storage->user->event,
+				"Invalid fts_index_timeout setting: %s",
+				error);
 		return -1;
 	}