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)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.