Skip to content

Commit 2d12cda

Browse files
author
Richard Jones
committed
Admin copy of error email from mailgw includes traceback
1 parent 372dcf0 commit 2d12cda

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

CHANGES.txt

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
11
This file contains the changes to the Roundup system over time. The entries
22
are given with the most recent entry first.
33

4-
2007-11-?? 1.4.1
5-
Fixed:
6-
- Removed some metakit references
4+
2007-??-?? 1.4.2
5+
Feature:
76
- New config option in mail section: ignore_alternatives allows to
87
ignore alternatives besides the text/plain part used for the content
98
of a message in multipart/alternative attachments.
109
- Handle no time.tzset under Windows (sf #1825643)
10+
- Admin copy of error email from mailgw includes traceback (thanks Ulrik
11+
Mikaelsson)
12+
13+
14+
2007-11-09 1.4.1
15+
Fixed:
16+
- Removed some metakit references
1117

1218

1319
2007-11-04 1.4.0

doc/index.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ Will Maier,
129129
Georges Martin,
130130
Gordon McMillan,
131131
John F Meinel Jr,
132+
Ulrik Mikaelsson,
132133
John Mitchell,
133134
Ramiro Morales,
134135
Toni Mueller,

roundup/mailgw.py

Lines changed: 6 additions & 3 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.193 2007-11-14 14:57:47 schlatterbeck Exp $
76+
$Id: mailgw.py,v 1.194 2007-11-19 20:45:57 richard Exp $
7777
"""
7878
__docformat__ = 'restructuredtext'
7979

@@ -764,12 +764,15 @@ def handle_Message(self, message):
764764

765765
# bounce the message back to the sender with the error message
766766
# let the admin know that something very bad is happening
767-
sendto = [sendto[0][1], self.instance.config.ADMIN_EMAIL]
768767
m = ['']
769768
m.append('An unexpected error occurred during the processing')
770769
m.append('of your message. The tracker administrator is being')
771770
m.append('notified.\n')
772-
self.mailer.bounce_message(message, sendto, m)
771+
self.mailer.bounce_message(message, sendto[0][1], m)
772+
773+
m.append('----------------')
774+
m.append(traceback.format_exc())
775+
self.mailer.bounce_message(message, [self.instance.config.ADMIN_EMAIL], m)
773776

774777
def handle_message(self, message):
775778
''' message - a Message instance

0 commit comments

Comments
 (0)