From: Timo Sirainen <timo.sirainen@open-xchange.com>
Date: Thu, 22 Aug 2024 09:25:12 +0000 (+0300)
Subject: quota: Use shared code for setting quota-backend: event log prefix
X-Git-Tag: 2.4.1~655
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=983464a47e769f2aecc94635d30e76abe274c985;p=thirdparty%2Fdovecot%2Fcore.git

quota: Use shared code for setting quota-backend: event log prefix
---

diff --git a/src/plugins/quota/quota-count.c b/src/plugins/quota/quota-count.c
index af7dfc7edb..dd69a6b637 100644
--- a/src/plugins/quota/quota-count.c
+++ b/src/plugins/quota/quota-count.c
@@ -238,8 +238,6 @@ static struct quota_root *count_quota_alloc(void)
 static int count_quota_init(struct quota_root *root,
 			    const char **error_r ATTR_UNUSED)
 {
-	event_set_append_log_prefix(root->backend.event, "quota-count: ");
-
 	root->auto_updating = TRUE;
 	return 0;
 }
diff --git a/src/plugins/quota/quota-fs.c b/src/plugins/quota/quota-fs.c
index 4e7f7282f3..c5fe869f81 100644
--- a/src/plugins/quota/quota-fs.c
+++ b/src/plugins/quota/quota-fs.c
@@ -157,8 +157,6 @@ static int fs_quota_init(struct quota_root *_root, const char **error_r)
 	else if (strcmp(root->set->quota_fs_type, "group") == 0)
 		root->user_disabled = TRUE;
 
-	event_set_append_log_prefix(_root->backend.event, "quota-fs: ");
-
 	_root->auto_updating = TRUE;
 	return 0;
 }
diff --git a/src/plugins/quota/quota-imapc.c b/src/plugins/quota/quota-imapc.c
index 42ede042c6..4b650e69cb 100644
--- a/src/plugins/quota/quota-imapc.c
+++ b/src/plugins/quota/quota-imapc.c
@@ -95,7 +95,6 @@ static int imapc_quota_init(struct quota_root *_root, const char **error_r)
 		return -1;
 
 	_root->auto_updating = TRUE;
-	event_set_append_log_prefix(root->root.backend.event, "quota-imapc: ");
 	return 0;
 }
 
diff --git a/src/plugins/quota/quota-maildir.c b/src/plugins/quota/quota-maildir.c
index e89553b528..0556af89a2 100644
--- a/src/plugins/quota/quota-maildir.c
+++ b/src/plugins/quota/quota-maildir.c
@@ -750,10 +750,9 @@ static struct quota_root *maildir_quota_alloc(void)
 	return &root->root;
 }
 
-static int maildir_quota_init(struct quota_root *_root,
+static int maildir_quota_init(struct quota_root *_root ATTR_UNUSED,
 			      const char **error_r ATTR_UNUSED)
 {
-	event_set_append_log_prefix(_root->backend.event, "quota-maildir: ");
 	return 0;
 }
 
diff --git a/src/plugins/quota/quota.c b/src/plugins/quota/quota.c
index cc6ec84b7d..68dff7dc3a 100644
--- a/src/plugins/quota/quota.c
+++ b/src/plugins/quota/quota.c
@@ -220,6 +220,8 @@ quota_root_init(struct quota *quota, struct event *set_event, const char *root_n
 	const char *backend_filter =
 		t_strdup_printf("quota_%s", root->backend.name);
 	root->backend.event = event_create(quota->event);
+	event_set_append_log_prefix(root->backend.event,
+		t_strdup_printf("quota-%s: ", root->backend.name));
 	event_add_str(root->backend.event, "quota", root_name);
 	event_set_ptr(root->backend.event, SETTINGS_EVENT_FILTER_NAME,
 		      p_strdup(event_get_pool(root->backend.event), backend_filter));