Fixed sig handler unsubscribe test for Unix, plus an odd race condition in autoreload.

1 files changed, 6 insertions, 5 deletions

diff --git a/cherrypy/process/plugins.py b/cherrypy/process/plugins.py
index 29f63342..ca3ab836 100644
--- a/cherrypy/process/plugins.py
+++ b/cherrypy/process/plugins.py
@@ -70,8 +70,8 @@ class SignalHandler(object):
                 pass
     
     def unsubscribe(self):
-        for sig, handler in self._previous_handlers.iteritems():
-            signame = self.signals[sig]
+        for signum, handler in self._previous_handlers.iteritems():
+            signame = self.signals[signum]
             
             if handler is None:
                 self.bus.log("Restoring %s handler to SIG_DFL." % signame)
@@ -80,10 +80,10 @@ class SignalHandler(object):
                 self.bus.log("Restoring %s handler %r." % (signame, handler))
             
             try:
-                _signal.signal(sig, handler)
+                _signal.signal(signum, handler)
             except ValueError:
                 self.bus.log("Unable to restore %s handler %r." %
-                             (signame, handler))
+                             (signame, handler), traceback=True)
     
     def set_handler(self, signal, listener=None):
         """Subscribe a handler for the given signal (number or name).
@@ -397,9 +397,10 @@ class Monitor(SimplePlugin):
             self.bus.log("No thread running for %s." % self.__class__.__name__)
         else:
             if self.thread is not threading.currentThread():
+                name = self.thread.getName()
                 self.thread.cancel()
                 self.thread.join()
-                self.bus.log("Stopped thread %r." % self.thread.getName())
+                self.bus.log("Stopped thread %r." % name)
             self.thread = None
     
     def graceful(self):