New version that is much more compact and easier to maintain. (Sjoerd)
diff --git a/Tools/scripts/mailerdaemon.py b/Tools/scripts/mailerdaemon.py
index c065eb2..5ebe18b 100755
--- a/Tools/scripts/mailerdaemon.py
+++ b/Tools/scripts/mailerdaemon.py
@@ -3,7 +3,7 @@
import string
import rfc822
import calendar
-import regex
+import re
import os
import sys
@@ -12,6 +12,7 @@
class ErrorMessage(rfc822.Message):
def __init__(self, fp):
rfc822.Message.__init__(self, fp)
+ self.sub = ''
def is_warning(self):
sub = self.getheader('Subject')
@@ -32,245 +33,120 @@
pass
raise Unparseable
-sendmail_pattern = regex.compile('[0-9][0-9][0-9] ')
-def emparse_sendmail(fp, sub):
- while 1:
- line = fp.readline()
- if not line:
- raise Unparseable
- line = line[:-1]
+# List of re's or tuples of re's.
+# If a re, it should contain at least a group (?P<email>...) which
+# should refer to the email address. The re can also contain a group
+# (?P<reason>...) which should refer to the reason (error message).
+# If no reason is present, the emparse_list_reason list is used to
+# find a reason.
+# If a tuple, the tuple should contain 2 re's. The first re finds a
+# location, the second re is repeated one or more times to find
+# multiple email addresses. The second re is matched (not searched)
+# where the previous match ended.
+# The re's are compiled using the re module.
+emparse_list_list = [
+ 'error: (?P<reason>unresolvable): (?P<email>.+)',
+ ('----- The following addresses had permanent fatal errors -----\n',
+ '(?P<email>[^ \n].*)\n( .*\n)?'),
+ 'remote execution.*\n.*rmail (?P<email>.+)',
+ ('The following recipients did not receive your message:\n\n',
+ ' +(?P<email>.*)\n(The following recipients did not receive your message:\n\n)?'),
+ '------- Failure Reasons --------\n\n(?P<reason>.*)\n(?P<email>.*)',
+ '^<(?P<email>.*)>:\n(?P<reason>.*)',
+ '^(?P<reason>User mailbox exceeds allowed size): (?P<email>.+)',
+ '^5\\d{2} <(?P<email>[^\n>]+)>\\.\\.\\. (?P<reason>.+)',
+ '^Original-Recipient: rfc822;(?P<email>.*)',
+ '^did not reach the following recipient\\(s\\):\n\n(?P<email>.*) on .*\n +(?P<reason>.*)',
+ '^ <(?P<email>[^\n>]+)> \\.\\.\\. (?P<reason>.*)',
+ '^Report on your message to: (?P<email>.*)\nReason: (?P<reason>.*)',
+ '^Your message was not delivered to +(?P<email>.*)\n +for the following reason:\n +(?P<reason>.*)',
+ '^ was not +(?P<email>[^ \n].*?) *\n.*\n.*\n.*\n because:.*\n +(?P<reason>[^ \n].*?) *\n',
+ ]
+# compile the re's in the list and store them in-place.
+for i in range(len(emparse_list_list)):
+ x = emparse_list_list[i]
+ if type(x) is type(''):
+ x = re.compile(x, re.MULTILINE)
+ else:
+ xl = []
+ for x in x:
+ xl.append(re.compile(x, re.MULTILINE))
+ x = tuple(xl)
+ del xl
+ emparse_list_list[i] = x
+ del x
+del i
- # Check that we're not in the returned message yet
- if string.lower(line)[:5] == 'from:':
- raise Unparseable
- line = string.split(line)
- if len(line) > 3 and \
- ((line[0] == '-----' and line[1] == 'Transcript') or
- (line[0] == '---' and line[1] == 'The' and
- line[2] == 'transcript') or
- (line[0] == 'While' and
- line[1] == 'talking' and
- line[2] == 'to')):
- # Yes, found it!
- break
-
+# list of re's used to find reasons (error messages).
+# if a string, "<>" is replaced by a copy of the email address.
+# The expressions are searched for in order. After the first match,
+# no more expressions are searched for. So, order is important.
+emparse_list_reason = [
+ r'^5\d{2} <>\.\.\. (?P<reason>.*)',
+ '<>\.\.\. (?P<reason>.*)',
+ re.compile(r'^<<< 5\d{2} (?P<reason>.*)', re.MULTILINE),
+ re.compile('===== stderr was =====\nrmail: (?P<reason>.*)'),
+ re.compile('^Diagnostic-Code: (?P<reason>.*)', re.MULTILINE),
+ ]
+emparse_list_from = re.compile('^From:', re.IGNORECASE|re.MULTILINE)
+def emparse_list(fp, sub):
+ data = fp.read()
+ res = emparse_list_from.search(data)
+ if res is None:
+ from_index = len(data)
+ else:
+ from_index = res.start(0)
errors = []
- found_a_line = 0
- warnings = 0
- while 1:
- line = fp.readline()
- if not line:
- break
- line = line[:-1]
- if not line:
- continue
- if sendmail_pattern.match(line) == 4:
- # Yes, an error/warning line. Ignore 4, remember 5, stop on rest
- if line[0] == '5':
- errors.append(line)
- elif line[0] == '4':
- warnings = 1
- else:
- raise Unparseable
- line = string.split(line)
- if line and line[0][:3] == '---':
- break
- found_a_line = 1
- # special case for CWI sendmail
- if len(line) > 1 and line[1] == 'Undelivered':
- while 1:
- line = fp.readline()
- if not line:
+ emails = []
+ reason = None
+ for regexp in emparse_list_list:
+ if type(regexp) is type(()):
+ res = regexp[0].search(data, 0, from_index)
+ if res is not None:
+ try:
+ reason = res.group('reason')
+ except IndexError:
+ pass
+ while 1:
+ res = regexp[1].match(data, res.end(0), from_index)
+ if res is None:
+ break
+ emails.append(res.group('email'))
break
- line = string.strip(line)
- if not line:
- break
- errors.append(line + ': ' + sub)
- # Empty transcripts are ok, others without an error are not.
- if found_a_line and not (errors or warnings):
- raise Unparseable
- return errors
-
-def emparse_cts(fp, sub):
- while 1:
- line = fp.readline()
- if not line:
- raise Unparseable
- line = line[:-1]
-
- # Check that we're not in the returned message yet
- if string.lower(line)[:5] == 'from:':
- raise Unparseable
- line = string.split(line)
- if len(line) > 3 and line[0][:2] == '|-' and line[1] == 'Failed' \
- and line[2] == 'addresses':
- # Yes, found it!
- break
-
- errors = []
- while 1:
- line = fp.readline()
- if not line:
- break
- line = line[:-1]
- if not line:
- continue
- if line[:2] == '|-':
- break
- errors.append(line)
- return errors
-
-def emparse_aol(fp, sub):
- while 1:
- line = fp.readline()
- if not line:
- raise Unparseable
- line = line[:-1]
- if line:
- break
- exp = 'The mail you sent could not be delivered to:'
- if line[:len(exp)] != exp:
- raise Unparseable
- errors = []
- while 1:
- line = fp.readline()
- if sendmail_pattern.match(line) == 4:
- # Yes, an error/warning line. Ignore 4, remember 5, stop on rest
- if line[0] == '5':
- errors.append(line)
- elif line[0] != '4':
- raise Unparseable
- elif line == '\n':
- break
else:
- raise Unparseable
- return errors
-
-def emparse_compuserve(fp, sub):
- while 1:
- line = fp.readline()
- if not line:
- raise Unparseable
- line = line[:-1]
- if line:
- break
- exp = 'Your message could not be delivered for the following reason:'
- if line[:len(exp)] != exp:
+ res = regexp.search(data, 0, from_index)
+ if res is not None:
+ emails.append(res.group('email'))
+ try:
+ reason = res.group('reason')
+ except IndexError:
+ pass
+ break
+ if not emails:
raise Unparseable
- errors = []
- while 1:
- line = fp.readline()
- if not line: break
- if line[:3] == '---': break
- line = line[:-1]
- if not line: continue
- if line == 'Please resend your message at a later time.':
- continue
- line = 'Compuserve: ' + line
- errors.append(line)
+ if not reason:
+ reason = sub
+ if reason[:15] == 'returned mail: ':
+ reason = reason[15:]
+ for regexp in emparse_list_reason:
+ if type(regexp) is type(''):
+ for i in range(len(emails)-1,-1,-1):
+ email = emails[i]
+ exp = re.compile(string.join(string.split(regexp, '<>'), re.escape(email)), re.MULTILINE)
+ res = exp.search(data)
+ if res is not None:
+ errors.append(string.join(string.split(string.strip(email)+': '+res.group('reason'))))
+ del emails[i]
+ continue
+ res = regexp.search(data)
+ if res is not None:
+ reason = res.group('reason')
+ break
+ for email in emails:
+ errors.append(string.join(string.split(string.strip(email)+': '+reason)))
return errors
-prov_pattern = regex.compile('.* | \(.*\)')
-def emparse_providence(fp, sub):
- while 1:
- line = fp.readline()
- if not line:
- raise Unparseable
- line = line[:-1]
-
- # Check that we're not in the returned message yet
- if string.lower(line)[:5] == 'from:':
- raise Unparseable
- exp = 'The following errors occurred'
- if line[:len(exp)] == exp:
- break
-
- errors = []
- while 1:
- line = fp.readline()
- if not line:
- break
- line = line[:-1]
- if not line:
- continue
- if line[:4] == '----':
- break
- if prov_pattern.match(line) > 0:
- errors.append(prov_pattern.group(1))
-
- if not errors:
- raise Unparseable
- return errors
-
-def emparse_x400(fp, sub):
- exp = 'This report relates to your message:'
- while 1:
- line = fp.readline()
- if not line:
- raise Unparseable
- line = line[:-1]
-
- # Check that we're not in the returned message yet
- if string.lower(line)[:5] == 'from:':
- raise Unparseable
- if line[:len(exp)] == exp:
- break
-
- errors = []
- exp = 'Your message was not delivered to'
- while 1:
- line = fp.readline()
- if not line:
- break
- line = line[:-1]
- if not line:
- continue
- if line[:len(exp)] == exp:
- error = string.strip(line[len(exp):])
- sep = ': '
- while 1:
- line = fp.readline()
- if not line:
- break
- line = line[:-1]
- if not line:
- break
- if line[0] == ' ' and line[-1] != ':':
- error = error + sep + string.strip(line)
- sep = '; '
- errors.append(error)
- return errors
- raise Unparseable
-
-def emparse_passau(fp, sub):
- exp = 'Unable to deliver message because'
- while 1:
- line = fp.readline()
- if not line:
- raise Unparseable
- if string.lower(line)[:5] == 'from:':
- raise Unparseable
- if line[:len(exp)] == exp:
- break
-
- errors = []
- exp = 'Returned Text follows'
- while 1:
- line = fp.readline()
- if not line:
- raise Unparseable
- line = line[:-1]
- # Check that we're not in the returned message yet
- if string.lower(line)[:5] == 'from:':
- raise Unparseable
- if not line:
- continue
- if line[:len(exp)] == exp:
- return errors
- errors.append(string.strip(line))
-
-EMPARSERS = [emparse_sendmail, emparse_aol, emparse_cts, emparse_compuserve,
- emparse_providence, emparse_x400, emparse_passau]
+EMPARSERS = [emparse_list, ]
def sort_numeric(a, b):
a = string.atoi(a)
@@ -281,14 +157,14 @@
def parsedir(dir, modify):
os.chdir(dir)
- pat = regex.compile('^[0-9]*$')
+ pat = re.compile('^[0-9]*$')
errordict = {}
errorfirst = {}
errorlast = {}
nok = nwarn = nbad = 0
# find all numeric file names and sort them
- files = filter(lambda fn, pat=pat: pat.match(fn) > 0, os.listdir('.'))
+ files = filter(lambda fn, pat=pat: pat.match(fn) is not None, os.listdir('.'))
files.sort(sort_numeric)
for fn in files:
@@ -299,10 +175,12 @@
print '%s\t%-40s\t'%(fn, sender[1]),
if m.is_warning():
+ fp.close()
print 'warning only'
nwarn = nwarn + 1
if modify:
- os.unlink(fn)
+ os.rename(fn, ','+fn)
+## os.unlink(fn)
continue
try:
@@ -310,6 +188,7 @@
except Unparseable:
print '** Not parseable'
nbad = nbad + 1
+ fp.close()
continue
print len(errors), 'errors'
@@ -327,16 +206,22 @@
errordict[e] = errordict[e] + 1
errorlast[e] = '%s (%s)' % (fn, date)
+ fp.close()
nok = nok + 1
if modify:
- os.unlink(fn)
+ os.rename(fn, ','+fn)
+## os.unlink(fn)
print '--------------'
print nok, 'files parsed,',nwarn,'files warning-only,',
print nbad,'files unparseable'
print '--------------'
+ list = []
for e in errordict.keys():
- print errordict[e], errorfirst[e], '-', errorlast[e], '\t', e
+ list.append(errordict[e], errorfirst[e], errorlast[e], e)
+ list.sort()
+ for num, first, last, e in list:
+ print '%d %s - %s\t%s' % (num, first, last, e)
def main():
modify = 0