Mercurial > dovecot > original-hg > dovecot-2.2
changeset 16791:cc1ee7b50ca9
imapc: Don't log unnecessary errors at deinit about aborted hiearchy separator lookup.
The lookup is done asynchronously at startup. It doesn't matter if we never
get around to finishing it.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sat, 21 Sep 2013 02:55:27 +0300 |
| parents | c30453a58b4c |
| children | 4a969a2e9399 |
| files | src/lib-storage/index/imapc/imapc-list.c src/lib-storage/mail-user.c src/lib-storage/mail-user.h |
| diffstat | 3 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/index/imapc/imapc-list.c Fri Sep 20 10:45:22 2013 +0300 +++ b/src/lib-storage/index/imapc/imapc-list.c Sat Sep 21 02:55:27 2013 +0300 @@ -268,7 +268,7 @@ imapc_list_sep_verify(list); else if (reply->state == IMAPC_COMMAND_STATE_NO) imapc_list_copy_error_from_reply(list, MAIL_ERROR_PARAMS, reply); - else { + else if (!list->list.ns->user->deinitializing) { mailbox_list_set_critical(&list->list, "imapc: Command failed: %s", reply->text_full); }
--- a/src/lib-storage/mail-user.c Fri Sep 20 10:45:22 2013 +0300 +++ b/src/lib-storage/mail-user.c Sat Sep 21 02:55:27 2013 +0300 @@ -156,6 +156,8 @@ return; } + user->deinitializing = TRUE; + /* call deinit() with refcount=1, otherwise we may assert-crash in mail_user_ref() that is called by some deinit() handler. */ user->v.deinit(user);
--- a/src/lib-storage/mail-user.h Fri Sep 20 10:45:22 2013 +0300 +++ b/src/lib-storage/mail-user.h Sat Sep 21 02:55:27 2013 +0300 @@ -68,6 +68,8 @@ unsigned int dsyncing:1; /* Failed to create attribute dict, don't try again */ unsigned int attr_dict_failed:1; + /* We're deinitializing the user */ + unsigned int deinitializing:1; }; struct mail_user_module_register {