From 6b1c93415478d7614ef682d34c507f6d6c0de971 Mon Sep 17 00:00:00 2001 From: Andrew Fyfe Date: Thu, 9 Apr 2015 17:09:35 +0100 Subject: [PATCH] Look for SPAM as well when filtering the mail log. --- modoboa/extensions/stats/management/commands/logparser.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modoboa/extensions/stats/management/commands/logparser.py b/modoboa/extensions/stats/management/commands/logparser.py index 7af07fa18..a09241e80 100644 --- a/modoboa/extensions/stats/management/commands/logparser.py +++ b/modoboa/extensions/stats/management/commands/logparser.py @@ -297,12 +297,13 @@ class LogParser(object): if not m: return host, prog, pid, log = m.groups() - m = re.search("(INFECTED|SPAMMY) .* <[^>]+> -> <[^@]+@([^>]+)>.*", log) + m = re.search("(INFECTED|SPAM|SPAMMY) .* <[^>]+> -> <[^@]+@([^>]+)>.*", + log) if m is not None: if m.group(2) in self.domains: if m.group(1) == 'INFECTED': self.inc_counter(m.group(2), 'virus') - elif m.group(1) == 'SPAMMY': + elif m.group(1) == 'SPAM' or m.group(1) == 'SPAMMY': self.inc_counter(m.group(2), 'spam') return m = self._id_expr.match(log)