From: Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Date: Fri, 17 Mar 2017 10:58:08 +0000 (+0200)
Subject: global: Log mailbox_list internal errors
X-Git-Tag: 2.3.0.rc1~1902
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d4847b921058734e0668bc7690465c91523d9ec0;p=thirdparty%2Fdovecot%2Fcore.git

global: Log mailbox_list internal errors
---

diff --git a/src/doveadm/doveadm-mail-index.c b/src/doveadm/doveadm-mail-index.c
index 0e4ebb3375..2dca85eca0 100644
--- a/src/doveadm/doveadm-mail-index.c
+++ b/src/doveadm/doveadm-mail-index.c
@@ -206,7 +206,7 @@ cmd_index_run(struct doveadm_mail_cmd_context *_ctx, struct mail_user *user)
 	}
 	if (mailbox_list_iter_deinit(&iter) < 0) {
 		i_error("Listing mailboxes failed: %s",
-			mailbox_list_get_last_error(user->namespaces->list, NULL));
+			mailbox_list_get_last_internal_error(user->namespaces->list, NULL));
 		doveadm_mail_failed_error(_ctx, MAIL_ERROR_TEMP);
 		ret = -1;
 	}
diff --git a/src/doveadm/doveadm-mail-mailbox.c b/src/doveadm/doveadm-mail-mailbox.c
index c35e45dc33..1e96b7f753 100644
--- a/src/doveadm/doveadm-mail-mailbox.c
+++ b/src/doveadm/doveadm-mail-mailbox.c
@@ -741,7 +741,7 @@ cmd_mailbox_path_run(struct doveadm_mail_cmd_context *_ctx,
 	if (ret < 0) {
 		i_error("Failed to lookup mailbox %s path: %s",
 			ctx->mailbox,
-			mailbox_list_get_last_error(ns->list, &mail_error));
+			mailbox_list_get_last_internal_error(ns->list, &mail_error));
 		doveadm_mail_failed_error(_ctx, mail_error);
 	} else if (ret > 0) {
 		doveadm_print(path);
diff --git a/src/doveadm/doveadm-mail.c b/src/doveadm/doveadm-mail.c
index 4a597b91d3..a609cc7ab8 100644
--- a/src/doveadm/doveadm-mail.c
+++ b/src/doveadm/doveadm-mail.c
@@ -323,7 +323,7 @@ static int cmd_force_resync_run(struct doveadm_mail_cmd_context *ctx,
 	}
 	if (mailbox_list_iter_deinit(&iter) < 0) {
 		i_error("Listing mailboxes failed: %s",
-			mailbox_list_get_last_error(user->namespaces->list, NULL));
+			mailbox_list_get_last_internal_error(user->namespaces->list, NULL));
 		doveadm_mail_failed_list(ctx, user->namespaces->list);
 		ret = -1;
 	}
diff --git a/src/doveadm/doveadm-mailbox-list-iter.c b/src/doveadm/doveadm-mailbox-list-iter.c
index 0ddaa87b02..d6a99c0f5c 100644
--- a/src/doveadm/doveadm-mailbox-list-iter.c
+++ b/src/doveadm/doveadm-mailbox-list-iter.c
@@ -152,7 +152,7 @@ int doveadm_mailbox_list_iter_deinit(struct doveadm_mailbox_list_iter **_iter)
 		ret = 0;
 	else if ((ret = mailbox_list_iter_deinit(&iter->iter)) < 0) {
 		i_error("Listing mailboxes failed: %s",
-			mailbox_list_get_last_error(iter->user->namespaces->list, &error));
+			mailbox_list_get_last_internal_error(iter->user->namespaces->list, &error));
 		doveadm_mail_failed_error(iter->ctx, error);
 	}
 	array_free(&iter->patterns);
diff --git a/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c b/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c
index bcdad76783..4ad00fa913 100644
--- a/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c
+++ b/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c
@@ -148,7 +148,7 @@ int dsync_brain_mailbox_tree_sync_change(struct dsync_brain *brain,
 		if (mailbox_list_delete_dir(change->ns->list, storage_name) == 0)
 			return 0;
 
-		errstr = mailbox_list_get_last_error(change->ns->list, &error);
+		errstr = mailbox_list_get_last_internal_error(change->ns->list, &error);
 		if (error == MAIL_ERROR_NOTFOUND ||
 		    error == MAIL_ERROR_EXISTS) {
 			dsync_brain_set_changes_during_sync(brain, t_strdup_printf(
diff --git a/src/doveadm/dsync/dsync-mailbox-tree-fill.c b/src/doveadm/dsync/dsync-mailbox-tree-fill.c
index f290f9fd49..086b7bbabc 100644
--- a/src/doveadm/dsync/dsync-mailbox-tree-fill.c
+++ b/src/doveadm/dsync/dsync-mailbox-tree-fill.c
@@ -361,7 +361,7 @@ int dsync_mailbox_tree_fill(struct dsync_mailbox_tree *tree,
 	} T_END;
 	if (mailbox_list_iter_deinit(&iter) < 0) {
 		i_error("Mailbox listing for namespace '%s' failed: %s",
-			ns->prefix, mailbox_list_get_last_error(ns->list, error_r));
+			ns->prefix, mailbox_list_get_last_internal_error(ns->list, error_r));
 		ret = -1;
 	}
 
@@ -377,7 +377,7 @@ int dsync_mailbox_tree_fill(struct dsync_mailbox_tree *tree,
 	}
 	if (mailbox_list_iter_deinit(&iter) < 0) {
 		i_error("Mailbox listing for namespace '%s' failed: %s",
-			ns->prefix, mailbox_list_get_last_error(ns->list, error_r));
+			ns->prefix, mailbox_list_get_last_internal_error(ns->list, error_r));
 		ret = -1;
 	}
 	if (ret < 0)
diff --git a/src/imap/main.c b/src/imap/main.c
index 0a4ceb38cf..583086b728 100644
--- a/src/imap/main.c
+++ b/src/imap/main.c
@@ -240,7 +240,7 @@ int client_create_from_input(const struct mail_storage_service_input *input,
 	   imapc. */
 	ns = mail_namespace_find_inbox(mail_user->namespaces);
 	(void)mailbox_list_get_hierarchy_sep(ns->list);
-	errstr = mailbox_list_get_last_error(ns->list, &mail_error);
+	errstr = mailbox_list_get_last_internal_error(ns->list, &mail_error);
 	if (mail_error != MAIL_ERROR_NONE) {
 		*error_r = t_strdup(errstr);
 		mail_user_unref(&mail_user);
diff --git a/src/lib-imap-urlauth/imap-urlauth-backend.c b/src/lib-imap-urlauth/imap-urlauth-backend.c
index 1ea1a31981..adee95d13c 100644
--- a/src/lib-imap-urlauth/imap-urlauth-backend.c
+++ b/src/lib-imap-urlauth/imap-urlauth-backend.c
@@ -165,7 +165,7 @@ int imap_urlauth_backend_reset_all_keys(struct mail_user *user)
 	}
 	if (mailbox_list_iter_deinit(&iter) < 0) {
 		i_error("urlauth key reset: Couldn't iterate mailboxes: %s",
-			mailbox_list_get_last_error(user->namespaces->list, NULL));
+			mailbox_list_get_last_internal_error(user->namespaces->list, NULL));
 		ret = -1;
 	}
 	return ret;
diff --git a/src/lib-storage/list/mailbox-list-index-backend.c b/src/lib-storage/list/mailbox-list-index-backend.c
index c1045e276d..23bd2f639c 100644
--- a/src/lib-storage/list/mailbox-list-index-backend.c
+++ b/src/lib-storage/list/mailbox-list-index-backend.c
@@ -54,7 +54,7 @@ static int index_list_init(struct mailbox_list *_list, const char **error_r)
 	if (mailbox_list_get_root_path(_list, MAILBOX_LIST_PATH_TYPE_INDEX, &dir) &&
 	    mailbox_list_mkdir_root(_list, dir, MAILBOX_LIST_PATH_TYPE_INDEX) < 0) {
 		*error_r = t_strdup_printf("Failed to create the index root directory: %s",
-					   mailbox_list_get_last_error(_list, NULL));
+					   mailbox_list_get_last_internal_error(_list, NULL));
 		return -1;
 	}
 	return 0;
diff --git a/src/lib-storage/mail-autoexpunge.c b/src/lib-storage/mail-autoexpunge.c
index 26dc2c3c4d..b1f8333db9 100644
--- a/src/lib-storage/mail-autoexpunge.c
+++ b/src/lib-storage/mail-autoexpunge.c
@@ -177,7 +177,7 @@ mailbox_autoexpunge_wildcards(struct mail_namespace *ns,
 	} T_END;
 	if (mailbox_list_iter_deinit(&iter) < 0) {
 		i_error("Failed to iterate autoexpunge mailboxes '%s': %s",
-			iter_name, mailbox_list_get_last_error(ns->list, NULL));
+			iter_name, mailbox_list_get_last_internal_error(ns->list, NULL));
 	}
 }
 
diff --git a/src/plugins/quota/quota-count.c b/src/plugins/quota/quota-count.c
index 5b7019fa03..dd1f98206c 100644
--- a/src/plugins/quota/quota-count.c
+++ b/src/plugins/quota/quota-count.c
@@ -94,7 +94,7 @@ quota_mailbox_iter_deinit(struct quota_mailbox_iter **_iter)
 		if (mailbox_list_iter_deinit(&iter->iter) < 0) {
 			i_error("quota: Listing namespace '%s' failed: %s",
 				iter->ns->prefix,
-				mailbox_list_get_last_error(iter->ns->list, NULL));
+				mailbox_list_get_last_internal_error(iter->ns->list, NULL));
 			ret = -1;
 		}
 	}
@@ -130,7 +130,7 @@ quota_mailbox_iter_next(struct quota_mailbox_iter *iter)
 	if (mailbox_list_iter_deinit(&iter->iter) < 0) {
 		i_error("quota: Listing namespace '%s' failed: %s",
 			iter->ns->prefix,
-			mailbox_list_get_last_error(iter->ns->list, NULL));
+			mailbox_list_get_last_internal_error(iter->ns->list, NULL));
 		iter->failed = TRUE;
 	}
 	if (iter->ns->prefix_len > 0 &&
diff --git a/src/plugins/virtual/virtual-config.c b/src/plugins/virtual/virtual-config.c
index e8ace07c45..f56f64f485 100644
--- a/src/plugins/virtual/virtual-config.c
+++ b/src/plugins/virtual/virtual-config.c
@@ -439,7 +439,7 @@ static int virtual_config_expand_wildcards(struct virtual_parse_context *ctx,
 	for (i = 0; i < count; i++)
 		mail_search_args_unref(&wboxes[i]->search_args);
 	if (mailbox_list_iter_deinit(&iter) < 0) {
-		*error_r = mailbox_list_get_last_error(user->namespaces->list, NULL);
+		*error_r = mailbox_list_get_last_internal_error(user->namespaces->list, NULL);
 		return -1;
 	}
 	return ret < 0 ? -1 : 0;
diff --git a/src/pop3/pop3-client.c b/src/pop3/pop3-client.c
index b02e15ef48..52f4059613 100644
--- a/src/pop3/pop3-client.c
+++ b/src/pop3/pop3-client.c
@@ -353,7 +353,7 @@ static int pop3_lock_session(struct client *client)
 	}
 	if (mailbox_list_mkdir_root(client->inbox_ns->list, dir, type) < 0) {
 		i_error("pop3_lock_session: Couldn't create root directory %s: %s",
-			dir, mailbox_list_get_last_error(client->inbox_ns->list, NULL));
+			dir, mailbox_list_get_last_internal_error(client->inbox_ns->list, NULL));
 		return -1;
 	}
 	path = t_strdup_printf("%s/"POP3_LOCK_FNAME, dir);