Always reraise KeyboardInterrupt and SystemExit whenever IOLoop tries to

swallow exceptions.

diff --git a/tornado/ioloop.py b/tornado/ioloop.py
index 44cdffdeaaa70ff9896517b5e4d19e17220c14b9..8a325cb9c426429f435e3b5a231ec82f8162f679 100644 (file)
--- a/tornado/ioloop.py
+++ b/tornado/ioloop.py
@@ -195,7 +195,7 @@ class IOLoop(object):
                 fd, events = self._events.popitem()
                 try:
                     self._handlers[fd](fd, events)
-                except KeyboardInterrupt:
+                except (KeyboardInterrupt, SystemExit):
                     raise
                 except (OSError, IOError), e:
                     if e[0] == errno.EPIPE:
@@ -308,6 +308,8 @@ class PeriodicCallback(object):
         if not self._running: return
         try:
             self.callback()
+        except (KeyboardInterrupt, SystemExit):
+            raise
         except:
             logging.error("Error in periodic callback", exc_info=True)
         self.start()