Changeset 1998

Timestamp:

06/29/08 09:57:36

Author:

fumanchu

Message:

Test and fix for #826 (SignalHandler? needs an unsubscribe). Need nix testing.

Files:

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

trunk/cherrypy/process/plugins.py

@@ -60 +60 @@
-                         'SIGUSR1': self.bus.graceful,
-                         }
+        
+        self._previous_handlers = {}
-    
-    def subscribe(self):
@@ -67 +69 @@
-            except ValueError:
-                pass
+    
+    def unsubscribe(self):
+        for sig, handler in self._previous_handlers.iteritems():
+            signame = self.signals[sig]
+            
+            if handler is None:
+                self.bus.log("Restoring %s handler to SIG_DFL." % signame)
+                handler = _signal.SIG_DFL
+            else:
+                self.bus.log("Restoring %s handler %r." % (signame, handler))
+            
+            try:
+                _signal.signal(sig, handler)
+            except ValueError:
+                self.bus.log("Unable to restore %s handler %r." %
+                             (signame, handler))
-    
-    def set_handler(self, signal, listener=None):
@@ -89 +107 @@
-            signum = signal
-        
-# Should we do something with existing signal handlers?
-# cur = _signal.getsignal(signum)
-_signal.signal(signum, self._handle_signal)
+prev = _signal.signal(signum, self._handle_signal)
+self._previous_handlers[signum] = prev
+
-        if listener is not None:
-            self.bus.log("Listening for %s." % signame)

trunk/cherrypy/test/test_states.py

@@ -76 +76 @@
-        cherrypy._cpserver.wait_for_occupied_port(host, port)
-    
+    # Give the engine a wee bit more time to finish STARTING
+    if daemonize:
+        time.sleep(2)
+    else:
+        time.sleep(1)
+    
-    return result
-
@@ -159 +165 @@
-db_connection = Dependency(engine)
-db_connection.subscribe()
+
+
+
+# ------------ Enough helpers. Time for real live test cases. ------------ #
-
-
@@ -392 +402 @@
-        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())
@@ -431 +438 @@
-        write_conf(scheme=self.scheme)
-        pid = spawn_cp(wait=False, daemonize=False)
-        # Give the engine a wee bit more time to finish STARTING
-        time.sleep(1)
-        # Send a SIGHUP
-        os.kill(pid, SIGHUP)
@@ -459 +464 @@
-        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.
@@ -478 +480 @@
-            self.getPage("/exit")
-        wait(new_pid)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

trunk/cherrypy/test/test_states_demo.py

@@ -33 +33 @@
-        cherrypy.engine.exit()
-    exit.exposed = True
+    
+    def unsub_sig(self):
+        cherrypy.engine.signal_handler.unsubscribe()
+        return "OK"
+    unsub_sig.exposed = True
+
+try:
+    from signal import SIGTERM
+except ImportError:
+    pass
+else:
+    def old_term_handler(signum=None, frame=None):
+        cherrypy.log("I am an old SIGTERM handler.")
+    _signal.signal(SIGTERM, old_term_handler)
+
-
-def starterror():