summaryrefslogtreecommitdiff
path: root/Mailman/Queue
diff options
context:
space:
mode:
Diffstat (limited to 'Mailman/Queue')
-rw-r--r--Mailman/Queue/HTTPRunner.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/Mailman/Queue/HTTPRunner.py b/Mailman/Queue/HTTPRunner.py
index e2c053629..32620f458 100644
--- a/Mailman/Queue/HTTPRunner.py
+++ b/Mailman/Queue/HTTPRunner.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2006 by the Free Software Foundation, Inc.
+# Copyright (C) 2006-2007 by the Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
@@ -63,6 +63,8 @@ server = make_server(config.HTTP_HOST, config.HTTP_PORT,
qlog.info('HTTPRunner qrunner started.')
try:
server.serve_forever()
-except:
+# Do it this way because of exception hierarchy changes in Python 2.5. XXX
+# Change this to BaseException for Python 2.5.
+except (Exception, KeyboardInterrupt):
qlog.exception('HTTPRunner qrunner exiting.')
raise