From: Timo Sirainen <tss@iki.fi>
Date: Mon, 15 Feb 2010 03:22:19 +0000 (+0200)
Subject: dsync: Error handling fixes.
X-Git-Tag: 2.0.beta3~71
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7c8412dc80180274bb9c26ee928f07dedfb42d6;p=thirdparty%2Fdovecot%2Fcore.git

dsync: Error handling fixes.

--HG--
branch : HEAD
---

diff --git a/src/dsync/dsync-worker-local.c b/src/dsync/dsync-worker-local.c
index ff9de9282c..82a6c308f9 100644
--- a/src/dsync/dsync-worker-local.c
+++ b/src/dsync/dsync-worker-local.c
@@ -738,7 +738,8 @@ static int iter_local_mailbox_open(struct local_dsync_worker_msg_iter *iter)
 
 	guid = &iter->mailboxes[iter->mailbox_idx];
 	if (local_mailbox_open(worker, guid, &box) < 0) {
-		i_error("msg iteration failed: Couldn't open mailbox");
+		i_error("msg iteration failed: Couldn't open mailbox %s",
+			dsync_guid_to_str(guid));
 		iter->iter.failed = TRUE;
 		return -1;
 	}
diff --git a/src/dsync/dsync-worker.c b/src/dsync/dsync-worker.c
index 0d3e3f3d06..1ecf2f0e35 100644
--- a/src/dsync/dsync-worker.c
+++ b/src/dsync/dsync-worker.c
@@ -224,6 +224,8 @@ void dsync_worker_msg_get(struct dsync_worker *worker,
 
 	if (!worker->failed)
 		worker->v.msg_get(worker, mailbox, uid, callback, context);
+	else
+		callback(DSYNC_MSG_GET_RESULT_FAILED, NULL, context);
 }
 
 void dsync_worker_finish(struct dsync_worker *worker,