Skip to content

Commit 9c94c5e

Browse files
author
Richard Jones
committed
mailgw failures (unexpected ones) are forwarded to the roundup admin
1 parent 34aea63 commit 9c94c5e

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

CHANGES.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Fixed:
2525
. htmltemplate list() wasn't sorting...
2626
. allow abbreviation of "help" in admin tool too.
2727
. run_tests testReldate_date failed if LANG is 'german'
28+
. mailgw failures (unexpected ones) are forwarded to the roundup admin
2829

2930

3031
2002-01-16 - 0.4.0b2

roundup/mailgw.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class node. Any parts of other types are each stored in separate files
7373
an exception, the original message is bounced back to the sender with the
7474
explanatory message given in the exception.
7575
76-
$Id: mailgw.py,v 1.57 2002-01-22 22:27:43 richard Exp $
76+
$Id: mailgw.py,v 1.58 2002-01-23 21:41:56 richard Exp $
7777
'''
7878

7979

@@ -174,8 +174,11 @@ def handle_Message(self, message):
174174
m = self.bounce_message(message, sendto, m)
175175
except:
176176
# bounce the message back to the sender with the error message
177-
sendto = [sendto[0][1]]
177+
sendto = [sendto[0][1], self.instance.ADMIN_EMAIL]
178178
m = ['']
179+
m.append('An unexpected error occurred during the processing')
180+
m.append('of your message. The tracker administrator is being')
181+
m.append('notified.\n')
179182
m.append('---- traceback of failure ----')
180183
s = cStringIO.StringIO()
181184
import traceback
@@ -754,6 +757,9 @@ def parseContent(content, blank_line=re.compile(r'[\r\n]+\s*[\r\n]+'),
754757

755758
#
756759
# $Log: not supported by cvs2svn $
760+
# Revision 1.57 2002/01/22 22:27:43 richard
761+
# . handle stripping of "AW:" from subject line
762+
#
757763
# Revision 1.56 2002/01/22 11:54:45 rochecompaan
758764
# Fixed status change in mail gateway.
759765
#

0 commit comments

Comments
 (0)