From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Mon, 18 Mar 2024 21:45:59 +0000 (+0200)
Subject: fts: fts_backend_init() - Add event parameter
X-Git-Tag: 2.4.1~899
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1ad20dc9f4ba2cb826f2ba88053183034974628;p=thirdparty%2Fdovecot%2Fcore.git

fts: fts_backend_init() - Add event parameter
---

diff --git a/src/plugins/fts/fts-api.c b/src/plugins/fts/fts-api.c
index 6db3891ae4..5abc561cb9 100644
--- a/src/plugins/fts/fts-api.c
+++ b/src/plugins/fts/fts-api.c
@@ -77,7 +77,8 @@ fts_header_filters_deinit(struct fts_backend *backend)
 }
 
 int fts_backend_init(const char *backend_name, struct mail_namespace *ns,
-		     const char **error_r, struct fts_backend **backend_r)
+		     struct event *event, const char **error_r,
+		     struct fts_backend **backend_r)
 {
 	const struct fts_backend *be;
 	struct fts_backend *backend;
@@ -90,16 +91,17 @@ int fts_backend_init(const char *backend_name, struct mail_namespace *ns,
 
 	backend = be->v.alloc();
 	backend->ns = ns;
+	backend->event = event_create(event);
+	event_add_category(backend->event, &event_category_fts);
+	event_set_append_log_prefix(backend->event, t_strdup_printf(
+		"fts-%s: ", backend->name));
+
 	if (backend->v.init(backend, error_r) < 0) {
+		event_unref(&backend->event);
 		backend->v.deinit(backend);
 		return -1;
 	}
 
-	backend->event = event_create(mailbox_list_get_event(ns->list));
-	event_add_category(backend->event, &event_category_fts);
-	event_set_append_log_prefix(backend->event, t_strdup_printf(
-		"fts-%s: ", backend->name));
-
 	fts_header_filters_init(backend);
 	*backend_r = backend;
 	return 0;
diff --git a/src/plugins/fts/fts-api.h b/src/plugins/fts/fts-api.h
index 270b88ed87..6fb636510f 100644
--- a/src/plugins/fts/fts-api.h
+++ b/src/plugins/fts/fts-api.h
@@ -91,7 +91,8 @@ struct fts_multi_result {
 extern struct event_category event_category_fts;
 
 int fts_backend_init(const char *backend_name, struct mail_namespace *ns,
-		     const char **error_r, struct fts_backend **backend_r);
+		     struct event *event, const char **error_r,
+		     struct fts_backend **backend_r);
 void fts_backend_deinit(struct fts_backend **backend);
 
 /* Get the last_uid for the mailbox. */
diff --git a/src/plugins/fts/fts-storage.c b/src/plugins/fts/fts-storage.c
index a3f98c7336..bc0134eba1 100644
--- a/src/plugins/fts/fts-storage.c
+++ b/src/plugins/fts/fts-storage.c
@@ -871,7 +871,8 @@ fts_init_namespace(struct fts_mailbox_list *flist, struct mail_namespace *ns)
 	} else if (set->driver[0] == '\0') {
 		e_debug(ns->list->event,
 			"fts: No fts_driver setting - plugin disabled");
-	} else if (fts_backend_init(set->driver, ns, &error, &backend) < 0) {
+	} else if (fts_backend_init(set->driver, ns, ns->list->event,
+				    &error, &backend) < 0) {
 		flist->failed = TRUE;
 		e_error(ns->list->event,
 			"fts: Failed to initialize backend '%s': %s",