Mercurial > masqmail
changeset 374:a96bb42f597d
Improved log/debug messages.
If a route goes through a wrapper, then we don't know the remote host's name.
| author | markus schnalke <meillo@marmaro.de> |
|---|---|
| date | Sat, 14 Jan 2012 17:27:21 +0100 (2012-01-14) |
| parents | 4cab237ce923 |
| children | 3f923f97563b |
| files | src/deliver.c |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/deliver.c Sat Jan 14 11:47:57 2012 +0100 +++ b/src/deliver.c Sat Jan 14 17:27:21 2012 +0100 @@ -423,7 +423,7 @@ msg_out *msgout = (msg_out *) (msgout_node->data); smtp_out_mark_rcpts(psb, msgout->rcpt_list); - if (delivery_failures(msgout->msg, msgout->rcpt_list, "while connected with %s, the server replied\n\t%s", host, psb->buffer)) { + if (delivery_failures(msgout->msg, msgout->rcpt_list, "while connected with %s, the server replied\n\t%s", (route->wrapper) ? "<wrapper>" : host, psb->buffer)) { deliver_finish(msgout); } } @@ -450,7 +450,7 @@ smtp_out_msg(psb, msg, msgout->return_path, msgout->rcpt_list, msgout->hdr_list); - ok_fail = delivery_failures(msg, msgout->rcpt_list, "while connected with %s, the server replied\n\t%s", host, psb->buffer); + ok_fail = delivery_failures(msg, msgout->rcpt_list, "while connected with %s, the server replied\n\t%s", (route->wrapper) ? "<wrapper>" : host, psb->buffer); if ((psb->error == smtp_eof) || (psb->error == smtp_timeout)) { /* connection lost */ @@ -583,6 +583,7 @@ /* filter by allowed envelope sender */ if (!route_sender_is_allowed(route, msgout->msg->return_path)) { + DEBUG(6) debugf("sender `%s' is not allowed for this route\n", msgout->msg->return_path); destroy_msg_out(msgout_cloned); continue; }