Fix for #540.

1 files changed, 11 insertions, 0 deletions

diff --git a/cherrypy/_cpengine.py b/cherrypy/_cpengine.py
index 54c99e20..91db9b36 100644
--- a/cherrypy/_cpengine.py
+++ b/cherrypy/_cpengine.py
@@ -2,6 +2,7 @@
 
 import cgi
 import os
+import signal
 import sys
 import threading
 import time
@@ -22,6 +23,16 @@ def fileattr(m):
     return getattr(m, "__file__", None)
 
 
+def signal_handler(signum, frame):
+    if signum in (signal.SIGHUP,):
+        cherrypy.engine.reexec()
+    else:
+        cherrypy.server.stop()
+        cherrypy.engine.stop()
+signal.signal(signal.SIGHUP, signal_handler)
+signal.signal(signal.SIGTERM, signal_handler)
+
+
 class Engine(object):
     """The application engine, which exposes a request interface to (HTTP) servers."""