added socket timeout to attempt to prevent stuck processes (sf bug 665487)

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

diff --git a/CHANGES.txt b/CHANGES.txt
index d5e1ea71991da673fd88622c1e859a78288ab553..7b059988527539636b8ad724cc5d6b8ca412f6d6 100644 (file)
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -97,6 +97,7 @@ Fixed:
 - can now unset values in CSV editing (sf bug 704788)
 - fixed rdbms email address lookup (case insensitivity)
 - email file attachments added to issue files list (sf bug 711501)
+- added socket timeout to attempt to prevent stuck processes (sf bug 665487)
 
 
 2003-02-27 0.5.6

diff --git a/roundup/scripts/roundup_admin.py b/roundup/scripts/roundup_admin.py
index be963f53b3e7b8d3f51bbb1f6503811eb861754b..d4866f8d1c59b17f83c55d538a94903a49aa37fc 100644 (file)
--- a/roundup/scripts/roundup_admin.py
+++ b/roundup/scripts/roundup_admin.py
@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup_admin.py,v 1.4 2002-09-10 01:07:06 richard Exp $
+# $Id: roundup_admin.py,v 1.5 2003-04-24 04:27:32 richard Exp $
 
 # python version check
 from roundup import version_check
@@ -26,6 +26,10 @@ from roundup.i18n import _
 import sys
 
 def run():
+    # time out after a minute if we can
+    import socket
+    if hasattr(socket, 'setdefaulttimeout'):
+        socket.setdefaulttimeout(60)
     tool = AdminTool()
     sys.exit(tool.main())
 

diff --git a/roundup/scripts/roundup_mailgw.py b/roundup/scripts/roundup_mailgw.py
index 891ba7f0c8dde4071c9435cc4d8b08b9284e1176..65163d83905fa0045a2d55b984ff1416ef840737 100644 (file)
--- a/roundup/scripts/roundup_mailgw.py
+++ b/roundup/scripts/roundup_mailgw.py
@@ -14,7 +14,7 @@
 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 # 
-# $Id: roundup_mailgw.py,v 1.9 2003-03-24 02:56:30 richard Exp $
+# $Id: roundup_mailgw.py,v 1.10 2003-04-24 04:27:32 richard Exp $
 
 # python version check
 from roundup import version_check
@@ -136,6 +136,10 @@ def main(argv):
         db.close()
 
 def run():
+    # time out after a minute if we can
+    import socket
+    if hasattr(socket, 'setdefaulttimeout'):
+        socket.setdefaulttimeout(60)
     sys.exit(main(sys.argv))
 
 # call main

diff --git a/roundup/scripts/roundup_server.py b/roundup/scripts/roundup_server.py
index 1a113efb165dcf87a00902e8e3f99916358d396b..06de678a075ff2b3624c66542ce20f7647d1a77a 100644 (file)
--- 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.21 2003-03-26 04:54:59 richard Exp $
+$Id: roundup_server.py,v 1.22 2003-04-24 04:27:32 richard Exp $
 """
 
 # python version check
@@ -254,6 +254,11 @@ def abspath(path):
 def run():
     ''' Script entry point - handle args and figure out what to to.
     '''
+    # time out after a minute if we can
+    import socket
+    if hasattr(socket, 'setdefaulttimeout'):
+        socket.setdefaulttimeout(60)
+
     hostname = ''
     port = 8080
     pidfile = None