disable forking server when os.fork() not available [SF#938586]

Author: Richard Jones

CHANGES.txt

@@ -5,6 +5,7 @@ are given with the most recent entry first.
 Fixed:
 - sqlite migration drops some journal information (thanks David Linke)
 - user editing Role entry help text always appears
+- disable forking server when os.fork() not available (sf bug 938586)
 
 
 2004-04-18 0.7.0b3

roundup/cgi/client.py

@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.170 2004-04-05 06:13:42 richard Exp $
+# $Id: client.py,v 1.171 2004-04-20 21:57:10 richard Exp $
 
 """WWW request handler (also used in the stand-alone server).
 """
@@ -97,7 +97,9 @@ class Client:
     # pagesize, startwith
 
     def __init__(self, instance, request, env, form=None):
-        hyperdb.traceMark()
+        if __debug__:
+            hyperdb.traceMark()
+        self.start = time.time()
         self.instance = instance
         self.request = request
         self.env = env
@@ -140,7 +142,6 @@ def __init__(self, instance, request, env, form=None):
         self.additional_headers = {}
         self.response_code = 200
 
-
     def main(self):
         ''' Wrap the real main in a try/finally so we always close off the db.
         '''
@@ -212,6 +213,7 @@ def inner_main(self):
 
             # render the content
             self.write(self.renderContext())
+
         except SeriousError, message:
             self.write(str(message))
         except Redirect, url:
@@ -513,6 +515,9 @@ def renderContext(self):
             # let the template render figure stuff out
             result = pt.render(self, None, None, **args)
             self.additional_headers['Content-Type'] = pt.content_type
+            if os.environ.get('CGI_SHOW_TIMING', ''):
+                s = '<p>Time elapsed: %fs</p></body>'%(time.time()-self.start)
+                result = result.replace('</body>', s)
             return result
         except templating.NoTemplate, message:
             return '<strong>%s</strong>'%message

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.45 2004-04-09 01:31:16 richard Exp $
+$Id: roundup_server.py,v 1.46 2004-04-20 21:57:16 richard Exp $
 """
 __docformat__ = 'restructuredtext'
 
@@ -238,11 +238,19 @@ def error():
     exc_type, exc_value = sys.exc_info()[:2]
     return _('Error: %s: %s' % (exc_type, exc_value))
 
+# See whether we can use the forking server
+if hasattr(os, 'fork'):
+    class server_class(SocketServer.ForkingMixIn, BaseHTTPServer.HTTPServer):
+        pass
+else:
+    server_class = BaseHTTPServer.HTTPServer
+
 try:
     import win32serviceutil
 except:
     RoundupService = None
 else:
+
     # allow the win32
     import win32service
     import win32event
@@ -460,12 +468,9 @@ def run(port=PORT, success_message=None):
         # obtain server before changing user id - allows to use port <
         # 1024 if started as root
         address = (hostname, port)
-        server_klass = BaseHTTPServer.HTTPServer
-        class server_klass(SocketServer.ForkingMixIn,
-                BaseHTTPServer.HTTPServer):
-            pass
+
         try:
-            httpd = server_klass(address, RoundupRequestHandler)
+            httpd = server_class(address, RoundupRequestHandler)
         except socket.error, e:
             if e[0] == errno.EADDRINUSE:
                 raise socket.error, \

tools/load_tracker.py

@@ -1,5 +1,5 @@
 #! /usr/bin/env python
-# $Id: load_tracker.py,v 1.1 2004-04-20 05:47:33 richard Exp $
+# $Id: load_tracker.py,v 1.2 2004-04-20 21:57:29 richard Exp $
 
 '''
 Usage: %s <tracker home> <N>
@@ -71,6 +71,8 @@
             priority=random.choice(priorities),
             status=random.choice(statuses),
             assignedto=random.choice(users))
+        if i%100:
+            db.commit()
     print
 
     db.commit()