Mercurial > dovecot > core-2.2

changeset 21261:00f1de810983

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dsync: Add mailbox names as well as GUIDs to log messages.
author Timo Sirainen <timo.sirainen@dovecot.fi>
date Fri, 02 Dec 2016 22:29:31 +0200
parents 0dd59dcdd804
children 0deeb9440b67
files src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c	Thu Dec 01 02:29:44 2016 +0200
+++ b/src/doveadm/dsync/dsync-brain-mailbox-tree-sync.c	Fri Dec 02 22:29:31 2016 +0200
@@ -129,13 +129,15 @@
 		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;
 		}