Merge pull request #56 from furbrain/master

Fix bug with timer scheduling
tingbot · Apr 6, 2017 · e1096ca · e1096ca
2 parents 96256c6 + a742e2b
commit e1096ca
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/tingbot/run_loop.py b/tingbot/run_loop.py
@@ -80,7 +80,7 @@ def run(self):
         while self.running:
             if len(self.timers) > 0:
                 try:
-                    self._wait(self.timers[-1].next_fire_time)
+                    self._wait(lambda: self.timers[-1].next_fire_time)
                 except Exception as e:
                     self._error(e)
                     continue
@@ -102,7 +102,8 @@ def run(self):
                             self.schedule(next_timer)
             else:
                 try:
-                    self._wait(time.time() + 0.1)
+                    wait_delay = time.time() + 0.1
+                    self._wait(lambda: wait_delay)
                 except Exception as e:
                     self._error(e)
 
@@ -131,12 +132,12 @@ def empty_call_after_queue(cls):
                 cls._call_after_queue.task_done()
             except Queue.Empty:
                 break
-        
+
 
     def _wait(self, until):
         self._wait_callbacks()
 
-        while time.time() < until:
+        while time.time() < until():
             if not self._call_after_queue.empty():
                 self.empty_call_after_queue()
             time.sleep(0.001)