quota-clone: Use events for error logging

diff --git a/src/plugins/quota-clone/quota-clone-plugin.c b/src/plugins/quota-clone/quota-clone-plugin.c
index 5f5efa41ad2c777808b204b5244e6d85e5165285..3e2c94847e5fe0bb0c042e919141c474efce94ae 100644 (file)
--- a/src/plugins/quota-clone/quota-clone-plugin.c
+++ b/src/plugins/quota-clone/quota-clone-plugin.c
@@ -38,8 +38,11 @@ struct quota_clone_user {
 
 static void
 quota_clone_dict_commit(const struct dict_commit_result *result,
-                       struct quota_clone_user *quser)
+                       struct mail_user *user)
 {
+       struct quota_clone_user *quser =
+               QUOTA_CLONE_USER_CONTEXT_REQUIRE(user);
+
        switch (result->ret) {
        case DICT_COMMIT_RET_OK:
        case DICT_COMMIT_RET_NOTFOUND:
@@ -48,12 +51,12 @@ quota_clone_dict_commit(const struct dict_commit_result *result,
                break;
        case DICT_COMMIT_RET_FAILED:
                quser->quota_changed = TRUE;
-               i_error("quota_clone_dict: Failed to write value: %s",
+               e_error(user->event, "quota_clone_dict: Failed to write value: %s",
                        result->error);
                break;
        case DICT_COMMIT_RET_WRITE_UNCERTAIN:
                quser->quota_changed = TRUE;
-               i_error("quota_clone_dict: Write was unconfirmed (timeout or disconnect): %s",
+               e_error(user->event, "quota_clone_dict: Write was unconfirmed (timeout or disconnect): %s",
                        result->error);
                break;
        }
@@ -86,7 +89,7 @@ static bool quota_clone_flush_real(struct mail_user *user)
        bytes_res = quota_get_resource(root, "", QUOTA_NAME_STORAGE_BYTES,
                                       &bytes_value, &limit, &error);
        if (bytes_res == QUOTA_GET_RESULT_INTERNAL_ERROR) {
-               i_error("quota_clone_plugin: "
+               e_error(user->event, "quota_clone_plugin: "
                        "Failed to get quota resource "QUOTA_NAME_STORAGE_BYTES": %s",
                        error);
                return TRUE;
@@ -94,7 +97,7 @@ static bool quota_clone_flush_real(struct mail_user *user)
        count_res = quota_get_resource(root, "", QUOTA_NAME_MESSAGES,
                                       &count_value, &limit, &error);
        if (count_res == QUOTA_GET_RESULT_INTERNAL_ERROR) {
-               i_error("quota_clone_plugin: "
+               e_error(user->event, "quota_clone_plugin: "
                        "Failed to get quota resource "QUOTA_NAME_MESSAGES": %s",
                        error);
                return TRUE;
@@ -129,7 +132,7 @@ static bool quota_clone_flush_real(struct mail_user *user)
                         t_strdup_printf("%"PRIu64, count_value));
        }
        quser->quota_changed = FALSE;
-       dict_transaction_commit_async(&trans, quota_clone_dict_commit, quser);
+       dict_transaction_commit_async(&trans, quota_clone_dict_commit, user);
        return FALSE;
 }
 
@@ -276,7 +279,7 @@ static void quota_clone_mail_user_created(struct mail_user *user)
        dict_set.base_dir = user->set->base_dir;
        dict_set.event_parent = user->event;
        if (dict_init(uri, &dict_set, &dict, &error) < 0) {
-               i_error("quota_clone_dict: Failed to initialize '%s': %s",
+               e_error(user->event, "quota_clone_dict: Failed to initialize '%s': %s",
                        uri, error);
                return;
        }