Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jfisteus/periodic_callback' into merge

This commit is contained in:
Ben Darnell 2011-08-02 23:44:21 -07:00
parent 6ec7b47cf8 c4c596044f
commit 01be222ec8
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tornado/ioloop.py
View File

@ -444,8 +444,8 @@ class PeriodicCallback(object):
def start(self): def start(self):
"""Starts the timer.""" """Starts the timer."""
self._running = True self._running = True
timeout = time.time() + self.callback_time / 1000.0 self._next_timeout = time.time()
self.io_loop.add_timeout(timeout, self._run) self._schedule_next()
def stop(self): def stop(self):
"""Stops the timer.""" """Stops the timer."""
@ -457,8 +457,12 @@ class PeriodicCallback(object):
self.callback() self.callback()
except Exception: except Exception:
logging.error("Error in periodic callback", exc_info=True) logging.error("Error in periodic callback", exc_info=True)
self._schedule_next()
def _schedule_next(self):
if self._running: if self._running:
self.start() self._next_timeout += self.callback_time / 1000.0
self.io_loop.add_timeout(self._next_timeout, self._run)
class _EPoll(object): class _EPoll(object):