From: Timo Sirainen <timo.sirainen@dovecot.fi>
Date: Fri, 2 Dec 2016 20:29:31 +0000 (+0200)
Subject: dsync: Add mailbox names as well as GUIDs to log messages.
X-Git-Tag: 2.2.27~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3fa668a0816a37bfe7125d3cee218fd37af08b2a;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Add mailbox names as well as GUIDs to log messages.
---

diff --git a/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c b/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c
index 618154ff14..04e9fd2083 100644
--- a/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c
+++ b/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c
@@ -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;
 		}