Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35 from andythigpen/fix-thread-stop 

Fix issue in Timer thread caused by variable name.
pull/36/head
Paulus Schoutsen 2015-02-21 16:00:30 -08:00
parent 69463308f5 8819aa7079
commit cfb7b8301c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/__init__.py
View File

@ -776,7 +776,7 @@ class Timer(threading.Thread):
self.daemon = True self.daemon = True
self.hass = hass self.hass = hass
self.interval = interval or TIMER_INTERVAL self.interval = interval or TIMER_INTERVAL
self._stop = threading.Event() self._stop_event = threading.Event()
# We want to be able to fire every time a minute starts (seconds=0). # We want to be able to fire every time a minute starts (seconds=0).
# We want this so other modules can use that to make sure they fire # We want this so other modules can use that to make sure they fire
@ -790,7 +790,7 @@ class Timer(threading.Thread):
""" Start the timer. """ """ Start the timer. """
self.hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP, self.hass.bus.listen_once(EVENT_HOMEASSISTANT_STOP,
lambda event: self._stop.set()) lambda event: self._stop_event.set())
_LOGGER.info("Timer:starting") _LOGGER.info("Timer:starting")
@ -799,7 +799,7 @@ class Timer(threading.Thread):
calc_now = dt.datetime.now calc_now = dt.datetime.now
interval = self.interval interval = self.interval
while not self._stop.isSet(): while not self._stop_event.isSet():
now = calc_now() now = calc_now()
# First check checks if we are not on a second matching the # First check checks if we are not on a second matching the