Skip to content

Commit a9a7292

Browse files
author
Richard Jones
committed
handle socket timeout exception (thanks Marcus Priesch)
1 parent 196bf96 commit a9a7292

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

CHANGES.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Feature:
77
- support setgid and running on port < 1024 (sf patch 777528)
88
- using Zope3's test runner now, allowing GC checks, nicer controls and
99
coverage analysis
10-
- added postgresql backend
10+
- added postgresql backend (originally from patch #761740, many changes since)
1111
- all RDBMS backends now have indexes on several columns
1212
- Change nosymessage and send_message to accept msgid=None (RFE #707235).
1313

@@ -49,6 +49,7 @@ Fixed:
4949
- Fixed "documentation" of getnodeids in roundup.hyperdb
5050
- added flush() to DevNull (sf bug #835365)
5151
- fixed javascript for help window for only one checkbox case
52+
- handle socket timeout exception (thanks Marcus Priesch)
5253

5354

5455
2003-09-29 0.6.2

roundup/scripts/roundup_server.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717
""" HTTP Server that serves roundup.
1818
19-
$Id: roundup_server.py,v 1.32 2003-10-25 12:26:42 jlgijsbers Exp $
19+
$Id: roundup_server.py,v 1.33 2003-11-11 21:51:52 richard Exp $
2020
"""
2121

2222
# python version check
@@ -78,6 +78,10 @@ def run_cgi(self):
7878
self.send_error(404, self.path)
7979
except client.Unauthorised:
8080
self.send_error(403, self.path)
81+
except socket.timeout:
82+
s = StringIO.StringIO()
83+
traceback.print_exc(None, s)
84+
self.log_message(str(s.getvalue()))
8185
except:
8286
# it'd be nice to be able to detect if these are going to have
8387
# any effect...

0 commit comments

Comments
 (0)