From f0d1296f9fb3a8b88a2dd0410646c83a978603bd Mon Sep 17 00:00:00 2001 From: richard Date: Fri, 9 Apr 2004 01:31:16 +0000 Subject: [PATCH] socket timeout error logging can fail git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@2271 57a73879-2fb5-44c3-a270-3262357dd7e2 --- CHANGES.txt | 6 ++++++ roundup/scripts/roundup_server.py | 7 ++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index c9a0566..5766c40 100644 --- 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 8983c6f..8afa8fd 100644 --- 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... -- 2.30.2