]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
dsync: Add mailbox names as well as GUIDs to log messages.
authorTimo Sirainen <timo.sirainen@dovecot.fi>
Fri, 2 Dec 2016 20:29:31 +0000 (22:29 +0200)
committerTimo Sirainen <timo.sirainen@dovecot.fi>
Sat, 3 Dec 2016 16:45:02 +0000 (18:45 +0200)
src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c

index 618154ff1401d1687e94eaf373d1ea86cde32c95..04e9fd20835e52bb4e7e3e280c7a8d1273efe38e 100644 (file)
@@ -129,13 +129,15 @@ int dsync_brain_mailbox_tree_sync_change(struct dsync_brain *brain,
                ret = dsync_brain_mailbox_alloc(brain, change->mailbox_guid,
                                                &box, &errstr, error_r);
                if (ret < 0) {
-                       i_error("Mailbox sync: Couldn't allocate mailbox GUID %s: %s",
+                       i_error("Mailbox sync: Couldn't allocate mailbox %s GUID %s: %s",
+                               change->full_name,
                                guid_128_to_string(change->mailbox_guid), errstr);
                        return -1;
                }
                if (ret == 0) {
                        dsync_brain_set_changes_during_sync(brain, t_strdup_printf(
-                               "Mailbox GUID %s deletion conflict: %s",
+                               "Mailbox %s GUID %s %s deletion conflict: %s",
+                               change->full_name,
                                guid_128_to_string(change->mailbox_guid), errstr));
                        return 0;
                }