socket timeout error logging can fail

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

diff --git a/CHANGES.txt b/CHANGES.txt
index c9a05661a4ac0f2034ccd0ca2620cf8ee8e92caf..5766c400a31f99323faca6d2ae97703005a954c9 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -136,6 +136,12 @@ Cleanup:
     class
 
 
+2004-??-?? 0.6.9
+Fixed:
+- paging in classhelp popup was broken
+- socket timeout error logging can fail
+
+
 2004-04-01 0.6.8
 Fixed:
 - existing trackers (ie. live ones) may be used as templates for new

diff --git a/roundup/scripts/roundup_server.py b/roundup/scripts/roundup_server.py
index 8983c6f25b0babb510592ea9cb3688e53045ed00..8afa8fdb9736e9d32bd804a6a3590838bcc9d86a 100644 (file)
--- a/roundup/scripts/roundup_server.py
+++ b/roundup/scripts/roundup_server.py
@@ -17,7 +17,7 @@
 
 """Command-line script that runs a server over roundup.cgi.client.
 
-$Id: roundup_server.py,v 1.44 2004-04-07 01:12:26 richard Exp $
+$Id: roundup_server.py,v 1.45 2004-04-09 01:31:16 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -99,10 +99,7 @@ class RoundupRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
         except:
             exc, val, tb = sys.exc_info()
             if hasattr(socket, 'timeout') and isinstance(val, socket.timeout):
-                # we can't send socket timeout errors back to the client, duh
-                s = StringIO.StringIO()
-                traceback.print_exc(None, s)
-                self.log_message(str(s.getvalue()))
+                self.log_error('timeout')
             else:
                 # it'd be nice to be able to detect if these are going to have
                 # any effect...