From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Tue, 11 Nov 2003 21:51:52 +0000 (+0000)
Subject: handle socket timeout exception (thanks Marcus Priesch)
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6b3985be17ccc86d938db7042d441695cc1eab8c;p=roundup.git

handle socket timeout exception (thanks Marcus Priesch)


git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1976 57a73879-2fb5-44c3-a270-3262357dd7e2
---

diff --git a/CHANGES.txt b/CHANGES.txt
index 2c700e8..d1b919e 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,7 +7,7 @@ Feature:
 - support setgid and running on port < 1024 (sf patch 777528)
 - using Zope3's test runner now, allowing GC checks, nicer controls and
   coverage analysis
-- added postgresql backend
+- added postgresql backend (originally from patch #761740, many changes since)
 - all RDBMS backends now have indexes on several columns
 - Change nosymessage and send_message to accept msgid=None (RFE #707235).
 
@@ -49,6 +49,7 @@ Fixed:
 - Fixed "documentation" of getnodeids in roundup.hyperdb
 - added flush() to DevNull (sf bug #835365)
 - fixed javascript for help window for only one checkbox case
+- handle socket timeout exception (thanks Marcus Priesch)
 
 
 2003-09-29 0.6.2
diff --git a/roundup/scripts/roundup_server.py b/roundup/scripts/roundup_server.py
index 757951a..05936ef 100644
--- a/roundup/scripts/roundup_server.py
+++ b/roundup/scripts/roundup_server.py
@@ -16,7 +16,7 @@
 # 
 """ HTTP Server that serves roundup.
 
-$Id: roundup_server.py,v 1.32 2003-10-25 12:26:42 jlgijsbers Exp $
+$Id: roundup_server.py,v 1.33 2003-11-11 21:51:52 richard Exp $
 """
 
 # python version check
@@ -78,6 +78,10 @@ class RoundupRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
             self.send_error(404, self.path)
         except client.Unauthorised:
             self.send_error(403, self.path)
+        except socket.timeout:
+            s = StringIO.StringIO()
+            traceback.print_exc(None, s)
+            self.log_message(str(s.getvalue()))
         except:
             # it'd be nice to be able to detect if these are going to have
             # any effect...