Changeset 1507

Timestamp:

12/10/06 16:58:08

Author:

fumanchu

Message:

2.x fix for #540 (signal handler). SIGTERM only in this branch (trunk does SIGHUP, too).

Files:

• branches/cherrypy-2.x/cherrypy/_cpengine.py (modified) (2 diffs)

branches/cherrypy-2.x/cherrypy/_cpengine.py

@@ -2 +2 @@
-
-import cgi
+import signal
-import sys
-import threading
@@ -15 +16 @@
-STARTING = None
-STARTED = 1
+
+
+try:
+    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
-
-