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 af7dfc7edbe1045e5cef9535c3b8dcfb53d7fbd4..dd69a6b637cee463fa4af85bdb1008584f176ca7 100644 (file)
--- 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 4e7f7282f33d2a15c445b0acb9af0bd8a28b1a44..c5fe869f81c2dd14a722c0a311527b63921a11f3 100644 (file)
--- 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 42ede042c65e5e688d18e097fb961f7836c3e211..4b650e69cbb2d3ec6949b8a90f778f3609ffdb4d 100644 (file)
--- 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 e89553b52899d39e4dc046d82eed2903780f0848..0556af89a2c5dd81f37e5a42598f3ccdd6a43efc 100644 (file)
--- 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 cc6ec84b7d54cd4fdc077aac8e958043f30e54bb..68dff7dc3aa51a6c89ff6785c32239a77b42ccd9 100644 (file)
--- 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));