From 5130b279d874b404304e099fb2aa9d5e70c4ae6a Mon Sep 17 00:00:00 2001 From: Joshua Tauberer Date: Fri, 10 Oct 2014 13:59:50 +0000 Subject: [PATCH] management/mail_log.py also include the previously rotated log file --- management/mail_log.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/management/mail_log.py b/management/mail_log.py index d7bc8408..7dac7c73 100755 --- a/management/mail_log.py +++ b/management/mail_log.py @@ -1,6 +1,6 @@ #!/usr/bin/python3 -import re +import re, os.path import dateutil.parser import mailconfig @@ -16,9 +16,11 @@ def scan_mail_log(logger, env): collector["real_mail_addresses"] = set(mailconfig.get_mail_users(env)) | set(alias[0] for alias in mailconfig.get_mail_aliases(env)) - with open("/var/log/mail.log") as log: - for line in log: - scan_mail_log_line(line.strip(), collector) + for fn in ('/var/log/mail.log.1', '/var/log/mail.log'): + if not os.path.exists(fn): continue + with open(fn) as log: + for line in log: + scan_mail_log_line(line.strip(), collector) if collector["imap-logins"]: logger.add_heading("Recent IMAP Logins") @@ -33,7 +35,7 @@ def scan_mail_log(logger, env): logger.print_line("recipient" + "\t" + "received" + "\t" + "sender" + "\t" + "delivered") for recipient in utils.sort_email_addresses(collector["postgrey"], env): for (client_address, sender), (first_date, delivered_date) in sorted(collector["postgrey"][recipient].items(), key = lambda kv : kv[1][0]): - logger.print_line(recipient + "\t" + str(first_date) + "\t" + sender + "\t" + (("delivered " + str(delivered_date)) if delivered_date else "no retry")) + logger.print_line(recipient + "\t" + str(first_date) + "\t" + sender + "\t" + (("delivered " + str(delivered_date)) if delivered_date else "no retry yet")) if collector["rejected-mail"]: logger.add_heading("Rejected Mail")