From: Ben Darnell <ben@bendarnell.com>
Date: Wed, 8 Sep 2010 22:06:21 +0000 (-0700)
Subject: Check self._running before rescheduling a PeriodicCallback, so stop() can
X-Git-Tag: v1.2.0~138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9163e3470da3bb82f310ad00925af8e92188a381;p=thirdparty%2Ftornado.git

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 d414b4f19..c88a1b010 100644
--- 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):