From a08e96bb7821294656492a57482d838571d10c00 Mon Sep 17 00:00:00 2001 From: Aki Tuomi Date: Wed, 5 Jul 2017 15:20:18 +0300 Subject: [PATCH] virtual: Append virtual mailbox information to get stream reason --- src/plugins/virtual/virtual-mail.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/plugins/virtual/virtual-mail.c b/src/plugins/virtual/virtual-mail.c index a6c69a34ff..2659fc39af 100644 --- a/src/plugins/virtual/virtual-mail.c +++ b/src/plugins/virtual/virtual-mail.c @@ -428,17 +428,23 @@ virtual_mail_get_stream(struct mail *mail, bool get_body, struct istream **stream_r) { struct virtual_mail *vmail = (struct virtual_mail *)mail; + struct mail_private *vp = (struct mail_private *)mail; struct mail *backend_mail; + const char *reason = t_strdup_printf("virtual mailbox %s: Opened mail UID=%u: %s", + mailbox_get_vname(mail->box), mail->uid, vp->get_stream_reason); int ret; if (backend_mail_get(vmail, &backend_mail) < 0) return -1; + if (get_body) { - ret = mail_get_stream(backend_mail, hdr_size, body_size, - stream_r); + ret = mail_get_stream_because(backend_mail, hdr_size, body_size, + reason, stream_r); } else { - ret = mail_get_hdr_stream(backend_mail, hdr_size, stream_r); + ret = mail_get_hdr_stream_because(backend_mail, hdr_size, + reason, stream_r); } + if (ret < 0) { virtual_box_copy_error(mail->box, backend_mail->box); return -1; -- 2.47.3