jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-11-13 13:00:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix time and task coro (#6968)

Browse Source 
* Bugfix time and task coro

* fix also other create_task

* fix tests

* fix lint in test
This commit is contained in:
Pascal Vizeli
2017-04-07 06:00:58 +02:00
committed by Paulus Schoutsen
parent d3c1a48475
commit a93c01788d
2 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
homeassistant/core.py
View File

@@ -31,7 +31,8 @@ from homeassistant.const import (
from homeassistant.exceptions import (
HomeAssistantError, InvalidEntityFormatError)
from homeassistant.util.async import (
run_coroutine_threadsafe, run_callback_threadsafe)
run_coroutine_threadsafe, run_callback_threadsafe,
fire_coroutine_threadsafe)
import homeassistant.util as util
import homeassistant.util.dt as dt_util
import homeassistant.util.location as location
@@ -131,7 +132,7 @@ class HomeAssistant(object):
def start(self) -> None:
"""Start home assistant."""
# Register the async start
self.add_job(self.async_start())
fire_coroutine_threadsafe(self.async_start(), self.loop)
# Run forever and catch keyboard interrupt
try:
@@ -140,7 +141,7 @@ class HomeAssistant(object):
self.loop.run_forever()
return self.exit_code
except KeyboardInterrupt:
self.loop.create_task(self.async_stop())
fire_coroutine_threadsafe(self.async_stop(), self.loop)
self.loop.run_forever()
finally:
self.loop.close()
@@ -246,8 +247,7 @@ class HomeAssistant(object):
def stop(self) -> None:
"""Stop Home Assistant and shuts down all threads."""
self.loop.call_soon_threadsafe(
self.loop.create_task, self.async_stop())
fire_coroutine_threadsafe(self.async_stop(), self.loop)
@asyncio.coroutine
def async_stop(self, exit_code=0) -> None:
@@ -1091,17 +1091,13 @@ def _async_create_timer(hass):
handle = hass.loop.call_later(slp_seconds, fire_time_event, nxt)
@callback
def start_timer(event):
"""Create an async timer."""
_LOGGER.info("Timer:starting")
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, stop_timer)
fire_time_event(monotonic())
@callback
def stop_timer(event):
"""Stop the timer."""
if handle is not None:
handle.cancel()
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_START, start_timer)
hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, stop_timer)
_LOGGER.info("Timer:starting")
fire_time_event(monotonic())