github-jwinterm/modoboa
1
0
Fork 0
mirror of https://github.com/jwinterm/modoboa.git synced 2026-10-19 05:58:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Look for SPAM as well when filtering the mail log.

Browse Source
This commit is contained in:
Andrew Fyfe
2015-04-09 17:09:35 +01:00
parent 10df752dc2
commit 6b1c934154
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modoboa/extensions/stats/management/commands/logparser.py
+3 -2
View File
@@ -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)