Changeset 1816

Timestamp:

11/02/07 17:27:23

Author:

lakin

Message:

Fixing the bug exposed by the unit test I just committed in : http://cherrypy.org/changeset/1815 . The fix is to catch SystemExit? errors and if we have a pending exception cause by earlier errors, we ensure that the exit code is not zero. Additionally due to some better understandings of what fork does, we move fork further back in the startup process. However, fork has issues when threads are already open, so we shuffle around the default priorities of various plugins to ensure all threads are started after Daemonization.

Files:

• trunk/cherrypy/restsrv/plugins.py (modified) (5 diffs)
• trunk/cherrypy/restsrv/wspbus.py (modified) (1 diff)

trunk/cherrypy/restsrv/plugins.py

@@ -165 +165 @@
-                self.bus.log('umask old: %03o, new: %03o' %
-                                (old_umask, umask))
-0
+5
-
-
@@ -187 +187 @@
-    
-    def start(self):
+        # forking has issues with threads:
+        # http://www.opengroup.org/onlinepubs/000095399/functions/fork.html
+        # " ... The general problem with making fork() work in a multi-threaded world
+        #  is what to do with all of the threads. ... "
+        # So we check for active threads:
+        if threading.activeCount() != 1:
+            self.bus.log('There are more than one active threads. Daemonizing now may cause strange failures.')
+            self.bus.log(str(threading.enumerate()))
+
-        # See http://www.erlenstar.demon.co.uk/unix/faq_2.html#SEC16
-        # (or http://www.faqs.org/faqs/unix-faq/programmer/faq/ section 1.7)
@@ -237 +246 @@
-        
-        self.bus.log('Daemonized to PID: %s' % os.getpid())
-10
+65
-
-
@@ -298 +307 @@
-            self.thread.start()
-            self.bus.log("Started thread %r." % threadname)
+    start.priority = 70
-    
-    def stop(self):
@@ -330 +340 @@
-        self.mtimes = {}
-        Monitor.start(self)
+    start.priority = 70 
-    
-    def run(self):

trunk/cherrypy/restsrv/wspbus.py

@@ -136 +136 @@
-            try:
-                output.append(listener(*args, **kwargs))
-(KeyboardInterrupt, SystemExit)
+KeyboardInterrupt
-                raise
+            except SystemExit, e:
+                # If we have previous errors ensure the exit code is non-zero
+                if exc and e.code == 0:
+                    e.code = 1
+                raise 
-            except:
-                self.log("Error in %r listener %r" % (channel, listener),