Changeset 1996

Timestamp:

06/29/08 01:31:48

Author:

fumanchu

Message:

Fix for #828 (CherryPy should exit on SIGHUP if not daemonized). The tests need to be exercised on Unix.

Files:

• trunk/cherrypy/process/plugins.py (modified) (2 diffs)
• trunk/cherrypy/test/test_states.py (modified) (6 diffs)

trunk/cherrypy/process/plugins.py

@@ -57 +57 @@
-        # Set default handlers
-        self.handlers = {'SIGTERM': self.bus.exit,
-bus.restart
+handle_SIGHUP
-                         'SIGUSR1': self.bus.graceful,
-                         }
@@ -101 +101 @@
-        self.bus.log("Caught signal %s." % signame)
-        self.bus.publish(signame)
-
+
+
+
+
+
+
+
+
+
-
-

trunk/cherrypy/test/test_states.py

@@ -376 +376 @@
-
-
-Daemonize
+Plugin
-    
-    def test_daemonize(self):
@@ -386 +386 @@
-            return
-        
-        # Start the demo script in a new process
-        # Spawn the process and wait, when this returns, the original process
-        # is finished.  If it daemonized properly, we should still be able
@@ -415 +414 @@
-
-
+class SignalHandlingTests(helper.CPWebCase):
+    
+    def test_SIGHUP_tty(self):
+        # When not daemonized, SIGHUP should shut down the server.
+        if not self.server_class:
+            print "skipped (no server) ",
+            return
+        
+        try:
+            from signal import SIGHUP
+        except ImportError:
+            print "skipped (no SIGHUP) ",
+            return
+        
+        # Spawn the process.
+        write_conf(scheme=self.scheme)
+        pid = spawn_cp(wait=False, daemonize=False)
+        # Send a SIGHUP
+        os.kill(pid, signal.SIGHUP)
+        # This might hang if things aren't working right, but meh.
+        wait(pid)
+    
+    def test_SIGHUP_daemonized(self):
+        # When daemonized, SIGHUP should restart the server.
+        if not self.server_class:
+            print "skipped (no server) ",
+            return
+        
+        try:
+            from signal import SIGHUP
+        except ImportError:
+            print "skipped (no SIGHUP) ",
+            return
+        
+        if os.name not in ['posix']: 
+            print "skipped (not on posix) ",
+            return
+        
+        # Spawn the process and wait, when this returns, the original process
+        # is finished.  If it daemonized properly, we should still be able
+        # to access pages.
+        write_conf(scheme=self.scheme)
+        exit_code = spawn_cp(wait=True, daemonize=True)
+        
+        # Give the server some time to start up
+        time.sleep(2)
+        
+        # Get the PID from the file.
+        pid = int(open(PID_file_path).read())
+        try:
+            # Send a SIGHUP
+            os.kill(pid, signal.SIGHUP)
+            # Give the server some time to restart
+            time.sleep(2)
+            self.getPage("/pid")
+            self.assertStatus(200)
+            new_pid = int(self.body)
+            self.assertNotEqual(new_pid, pid)
+        finally:
+            # Shut down the spawned process
+            self.getPage("/exit")
+        wait(new_pid)
+
+
+
+cases = [v for v in globals().values()
+         if isinstance(v, type) and issubclass(v, helper.CPWebCase)]
+
-def run(server, conf):
-    helper.setConfig(conf)
-ServerStateTests.server_class = server
-DaemonizeTests
- = helper.CPTestLoader.loadTestsFromTestCase(ServerStateTests)
-daemon_suite = helper.CPTestLoader.loadTestsFromTestCase(DaemonizeTests)
+for tc in cases:
+    tc
+s = [helper.CPTestLoader.loadTestsFromTestCase(tc) for tc in
+          (ServerStateTests, PluginTests, SignalHandlingTests)]
-    try:
-        try:
-            import pyconquer
-        except ImportError:
-helper.CPTestRunner.run(suite)
-helper.CPTestRunner.run(daemon_
+for suite in suites:
+    helper.CPTestRunner.run(
-        else:
-            tr = pyconquer.Logger("cherrypy")
@@ -432 +499 @@
-            try:
-                tr.start()
-helper.CPTestRunner.run(suite)
-helper.CPTestRunner.run(daemon_
+for suite in suites:
+    helper.CPTestRunner.run(
-            finally:
-                tr.stop()
@@ -449 +516 @@
-    
-    if host:
-
+
+
-    
-    if port:
-
+
+
-    
-    if ssl:
@@ -459 +528 @@
-        conf['server.ssl_certificate'] = serverpem
-        conf['server.ssl_private_key'] = serverpem
-
-
+
+
+
-    
-    def _run(server):