Changeset 1590

Timestamp:

01/09/07 12:31:06

Author:

fumanchu

Message:

Fix for #637 (Move signal handlers into Engine class).

Files:

• trunk/cherrypy/_cpconfig.py (modified) (2 diffs)
• trunk/cherrypy/_cpengine.py (modified) (4 diffs)

trunk/cherrypy/_cpconfig.py

@@ -18 +18 @@
-    dict where each key is a path, or "relative URL" (for example, "/" or
-    "/path/to/my/page"), and each value is a config dict. Usually, this
-cherrypy.
+
-    although you may also use app.merge(conf).
-    
@@ -106 +106 @@
-        'request.show_tracebacks': False,
-        'log.screen': False,
+        },
+    "embedded": {
+        # For use with CherryPy embedded in another deployment stack.
+        'engine.autoreload_on': False,
+        'checker.on': False,
+        'tools.log_headers.on': False,
+        'request.show_tracebacks': False,
+        'log.screen': False,
+        'engine.SIGHUP': None,
+        'engine.SIGTERM': None,
-        },
-    "test_suite": {

trunk/cherrypy/_cpengine.py

@@ -17 +17 @@
-STARTED = 1
-
-try:
-    if hasattr(signal, "SIGHUP"):
-        def SIGHUP(signum=None, frame=None):
-            cherrypy.engine.reexec()
-        signal.signal(signal.SIGHUP, SIGHUP)
-
-    if hasattr(signal, "SIGTERM"):
-        def SIGTERM(signum=None, frame=None):
-            cherrypy.server.stop()
-            cherrypy.engine.stop()
-        signal.signal(signal.SIGTERM, SIGTERM)
-except ValueError, _signal_exc:
-    if _signal_exc.args[0] != "signal only works in main thread":
-        raise
-
-
-class PerpetualTimer(threading._Timer):
@@ -44 +29 @@
-
-class Engine(object):
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    # Configurable attributes
@@ -81 +81 @@
-        
-        self.state = STARTED
+        
+        self._set_signals()
-        
-        freq = self.deadlock_poll_freq
@@ -264 +266 @@
-        self.start()
-    
+    
+    #                           Signal handling                           #
+    
+    SIGHUP = None
+    SIGTERM = None
+    
+    if hasattr(signal, "SIGHUP"):
+        def SIGHUP(self, signum=None, frame=None):
+            self.reexec()
+    
+    if hasattr(signal, "SIGTERM"):
+        def SIGTERM(signum=None, frame=None):
+            cherrypy.server.stop()
+            self.stop()
+    
+    def _set_signals(self):
+        if self.SIGHUP:
+            signal.signal(signal.SIGHUP, self.SIGHUP)
+        if self.SIGTERM:
+            signal.signal(signal.SIGTERM, self.SIGTERM)
+    
+    
+    #                           Drop privileges                           #
+    
-    # Special thanks to Gavin Baker: http://antonym.org/node/100.
-    try: