Check self._running before rescheduling a PeriodicCallback, so stop() can

be called from inside the callback.

Closes #135.

diff --git a/tornado/ioloop.py b/tornado/ioloop.py
index d414b4f199805962682baded5ce13bb9806e2ee3..c88a1b0107b5d399b991a80bdd8e0d3892b7984b 100644 (file)
--- a/tornado/ioloop.py
+++ b/tornado/ioloop.py
@@ -388,7 +388,8 @@ class PeriodicCallback(object):
             raise
         except:
             logging.error("Error in periodic callback", exc_info=True)
-        self.start()
+        if self._running:
+            self.start()
 
 
 class _EPoll(object):