Commits

Robert Brewer committed 3422994

Raise KBInt, SysExit, plus a typo. Thanks mcdonc!

Comments (0)

Files changed (2)

cherrypy/wsgiserver/wsgiserver2.py

         while self.ready:
             try:
                 self.tick()
+            except (KeyboardInterrupt, SystemExit):
+                raise
             except:
-                self.error_log("Error in HTTPServer.tick", level-logging.ERROR,
+                self.error_log("Error in HTTPServer.tick", level=logging.ERROR,
                                traceback=True)
             
             if self.interrupt:

cherrypy/wsgiserver/wsgiserver3.py

         while self.ready:
             try:
                 self.tick()
+            except (KeyboardInterrupt, SystemExit):
+                raise
             except:
                 self.error_log("Error in HTTPServer.tick", level=logging.ERROR,
                                traceback=True)