]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
indexer: Don't log mailbox was deleted under us error
authorMartti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
Wed, 27 Jun 2018 21:05:26 +0000 (00:05 +0300)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Thu, 28 Jun 2018 15:48:37 +0000 (15:48 +0000)
src/indexer/master-connection.c

index 18e448171c1adb10ff7f0b1802e479ace4d4995d..5b4c7ab63c0023b964a2c1fb6bb958ebbdf84bba 100644 (file)
@@ -56,6 +56,8 @@ index_mailbox_precache(struct master_connection *conn, struct mailbox *box)
        struct mail_storage *storage = mailbox_get_storage(box);
        const char *username = mail_storage_get_user(storage)->username;
        const char *box_vname = mailbox_get_vname(box);
+       const char *errstr;
+       enum mail_error error;
        struct mailbox_status status;
        struct mailbox_transaction_context *trans;
        struct mail_search_args *search_args;
@@ -122,11 +124,11 @@ index_mailbox_precache(struct master_connection *conn, struct mailbox *box)
        const char *uids = first_uid == 0 ? "" :
                t_strdup_printf(" (UIDs %u..%u)", first_uid, last_uid);
        if (mailbox_transaction_commit(&trans) < 0) {
-               i_error("Mailbox %s: Transaction commit failed: %s"
-                       " (attempted to index %u messages%s)",
-                       mailbox_get_vname(box),
-                       mailbox_get_last_internal_error(box, NULL),
-                       counter, uids);
+               errstr = mailbox_get_last_internal_error(box, &error);
+               if (error != MAIL_ERROR_NOTFOUND)
+                       i_error("Mailbox %s: Transaction commit failed: %s"
+                               " (attempted to index %u messages%s)",
+                               mailbox_get_vname(box), errstr, counter, uids);
                ret = -1;
        } else {
                i_info("Indexed %u messages in %s%s",