Fix for cherrypy hanging on shutdown. This should fix #14 and #171.

Thanks to Joshua Roesslein and "zombat"

1 files changed, 4 insertions, 2 deletions

diff --git a/bottle.py b/bottle.py
index 04fee46..0b0769d 100755
--- a/bottle.py
+++ b/bottle.py
@@ -1710,8 +1710,10 @@ class CherryPyServer(ServerAdapter):
     def run(self, handler): # pragma: no cover
         from cherrypy import wsgiserver
         server = wsgiserver.CherryPyWSGIServer((self.host, self.port), handler)
-        server.start()
-
+        try:
+            server.start()
+        finally:
+            server.stop()
 
 class PasteServer(ServerAdapter):
     def run(self, handler): # pragma: no cover