Mercurial > dovecot > original-hg > dovecot-1.2
changeset 5258:1fffd36401eb HEAD
Log the mailbox name, unless it's INBOX.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sat, 10 Mar 2007 14:54:20 +0200 |
| parents | c073fad758d5 |
| children | 228eacfb2647 |
| files | src/plugins/mail-log/mail-log-plugin.c |
| diffstat | 1 files changed, 14 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/plugins/mail-log/mail-log-plugin.c Sat Mar 10 13:54:39 2007 +0200 +++ b/src/plugins/mail-log/mail-log-plugin.c Sat Mar 10 14:54:20 2007 +0200 @@ -38,11 +38,22 @@ static void mail_log_action(struct mail *mail, const char *action) { - const char *msgid; + const char *msgid, *mailbox_str; + + mailbox_str = mailbox_get_name(mail->box); + if (strcmp(mailbox_str, "INBOX") == 0) { + /* most operations are for INBOX, and POP3 has only INBOX, + so don't add it. */ + mailbox_str = ""; + } else { + mailbox_str = str_sanitize(mailbox_str, 80); + mailbox_str = t_strconcat(", box=", mailbox_str, NULL); + } msgid = mail_get_first_header(mail, "Message-ID"); - i_info("%s: uid=%u, msgid=%s", action, mail->uid, - msgid == NULL ? "(null)" : str_sanitize(msgid, MSGID_LOG_LEN)); + i_info("%s: uid=%u, msgid=%s%s", action, mail->uid, + msgid == NULL ? "(null)" : str_sanitize(msgid, MSGID_LOG_LEN), + mailbox_str); } static int mail_log_mail_expunge(struct mail *_mail)