Changeset 1835

Timestamp:

11/27/07 11:58:14

Author:

lakin

Message:

Parent processes in Daemonizer should not even attempt to clean up after themselves, so use os._exit(0) instead of sys.exit(0). Updated tests and documentation to reflect the fact that if the first forkin Daemonizer completes, the process return code will always be 0.

Files:

• trunk/cherrypy/restsrv/plugins.py (modified) (3 diffs)
• trunk/cherrypy/test/test_states.py (modified) (1 diff)

trunk/cherrypy/restsrv/plugins.py

@@ -197 +197 @@
-    
-    When this component finishes, the process is completely decoupled from
-
+
+
+
+
+
+
-    """
-    
@@ -239 +244 @@
-                # This is the first parent. Exit, now that we've forked.
-                self.bus.log('Forking once.')
-sys.
+os._
-        except OSError, exc:
-            # Python raises OSError rather than returning negative numbers.
@@ -252 +257 @@
-            if pid > 0:
-                self.bus.log('Forking twice.')
-sys.
+os._
-        except OSError, exc:
-            sys.exit("%s: fork #2 failed: (%d) %s\n"

trunk/cherrypy/test/test_states.py

@@ -380 +380 @@
-        if exit_code != 0:
-            self.fail("Daemonized process failed to exit cleanly")
-    
-    def test_2_Start_Error_With_Daemonize(self):
-        if not self.server_class:
-            print "skipped (no server) ",
-            return
-        if os.name not in ['posix']: 
-            print "skipped (not on posix) ",
-            return
-        
-        # Start the demo script in a new process
-        demoscript = os.path.join(os.getcwd(), os.path.dirname(__file__),
-                                  "test_states_demo.py")
-        host = cherrypy.server.socket_host
-        port = cherrypy.server.socket_port
-        
-        # If a process errors during start, it should stop the engine
-        # and exit with a non-zero exit code, even if we daemonize soon
-        # thereafter.
-        args = [sys.executable, demoscript, host, str(port), '-starterror', '-daemonize']
-        if self.scheme == "https":
-            args.append('-ssl')
-        exit_code = os.spawnl(os.P_WAIT, sys.executable, *args)
-        if exit_code == 0:
-            self.fail("Process failed to return nonzero exit code.")
-        time.sleep(2) # Wait for the daemonized process to exit.
-
-