dovecot-2.2: imap: Fixed/improved error logging for FETCH

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/be26ae8a9fca
changeset: 16759:be26ae8a9fca
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Sep 16 10:05:24 2013 +0300
description:
imap: Fixed/improved error logging for FETCH

diffstat:

 src/imap/imap-fetch-body.c |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (25 lines):

diff -r 145be4e876a8 -r be26ae8a9fca src/imap/imap-fetch-body.c
--- a/src/imap/imap-fetch-body.c	Tue Sep 17 02:40:17 2013 +0300
+++ b/src/imap/imap-fetch-body.c	Mon Sep 16 10:05:24 2013 +0300
@@ -34,8 +34,8 @@
 	errno = state->cur_input->stream_errno;
 	mail_storage_set_critical(state->cur_mail->box->storage,
 		"read(%s) failed: %m (FETCH %s for mailbox %s UID %u)",
+		i_stream_get_name(state->cur_input),
 		state->cur_human_name,
-		i_stream_get_name(state->cur_input),
 		mailbox_get_vname(state->cur_mail->box), state->cur_mail->uid);
 }
 
@@ -102,9 +102,10 @@
 		}
 		if (!i_stream_have_bytes_left(state->cur_input)) {
 			/* Input stream gave less data than expected */
-			i_error("FETCH %s for mailbox %s UID %u "
+			i_error("read(%s): FETCH %s for mailbox %s UID %u "
 				"got too little data: "
 				"%"PRIuUOFF_T" vs %"PRIuUOFF_T,
+				i_stream_get_name(state->cur_input),
 				state->cur_human_name,
 				mailbox_get_vname(state->cur_mail->box),
 				state->cur_mail->uid,