Ticket #321: server.py.patch

Index: server.py
===================================================================
--- server.py   (revision 681)
+++ server.py   (working copy)
@@ -46,7 +46,10 @@
 onStopServerList = []
 onStopThreadList = []
 
+# should be False as long as we want the server to keep running
+command = 'start'
 
+
 def start(initOnly=False, serverClass=None):
     defaultOn = (cherrypy.config.get("server.environment") == "development")
     if cherrypy.config.get('autoreload.on', defaultOn):
@@ -59,8 +62,23 @@
             except KeyboardInterrupt:
                 cherrypy.log("<Ctrl-C> hit: shutting down autoreloader", "HTTP")
             return
-    
-    _start(initOnly, serverClass)
+    # continually recheck the server command upon call to _stop
+    while command != 'stop':
+        if initOnly:
+            # when started with initOnly, the server should initialize
+            # and then return control to the caller - thus we break out
+            # of this loop
+            _start(initOnly, serverClass)
+            break
+        elif command == 'suspend':
+            try:
+                time.sleep(0.2)
+                continue
+            except KeyboardInterrupt:
+                cherrypy.log("<Ctrl-C> hit: shutting down", "HTTP")
+                stop()
+        elif command == 'start':
+            _start(initOnly, serverClass)
 
 def _start(initOnly=False, serverClass=None):
     """
@@ -167,10 +185,12 @@
             # This should block until the http server stops.
             cherrypy._httpserver.start()
         except (KeyboardInterrupt, SystemExit):
-            pass
+            # we want to shutdown the server
+            global command
+            command = 'stop'
     finally:
         cherrypy.log("<Ctrl-C> hit: shutting down", "HTTP")
-        stop()
+        _stop()
 
 
 seen_threads = {}
@@ -217,14 +237,21 @@
         _cphttptools.Request(clientAddress, remoteHost,
                              requestLine, headers, rfile, scheme)
 
-def stop():
-    """Shutdown CherryPy (and any HTTP servers it started)."""
+def _stop():
+    """Stop any running http servers.
+
+    Unless cherrypy.server.command is 'stop' or 'suspend', the server will start
+    right up again, thus making this function equivalent to a
+    'restart' function.
+    """
     try:
         httpstop = cherrypy._httpserver.stop
     except AttributeError:
         pass
     else:
         httpstop()
+        # wait for worker threads to stop
+        time.sleep(1)
     
     # Call the functions from cherrypy.server.onStopThreadList
     for thread_ident, i in seen_threads.iteritems():
@@ -239,16 +266,23 @@
     cherrypy._httpserver = None
     cherrypy._appserver_state = 0
 
-def restart():
-    """Stop and start CherryPy."""
-    http = getattr(cherrypy, '_httpserver', None)
-    if http:
-        stop()
-        # Give HTTP servers time to shut down their thread pools.
-        time.sleep(1)
-        # Start the server in a new thread
-        thread_args = {"serverClass": http.__class__}
-        threading.Thread(target=_start, kwargs=thread_args).start()
-    else:
-        stop()
-        _start(initOnly=True)
+
+# to keep api and behavior compatibility
+restart = _stop
+
+def stop():
+    """Shutdown CherryPy (and any HTTP servers it started)."""
+    global command
+    command = 'stop'
+    _stop()
+
+def suspend():
+    global command
+    command = 'suspend'
+    _stop()
+
+def resume():
+    global command
+    command = 'start'
+    
+    
\ No newline at end of file