Home-Assistant/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-12-24 12:59:34 +00:00
Code Activity

Bugfix restore startup state (#6189)

Browse Source
This commit is contained in:
Johann Kellerman
2017-02-24 06:06:21 +02:00
committed by Paulus Schoutsen
parent 1d32bced1c
commit c940d26f07
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
homeassistant/helpers/restore_state.py
View File

@@ -48,13 +48,15 @@ def _load_restore_cache(hass: HomeAssistant):
@asyncio.coroutine
def async_get_last_state(hass, entity_id: str):
"""Helper to restore state."""
if (_RECORDER not in hass.config.components or
hass.state != CoreState.starting):
return None
if DATA_RESTORE_CACHE in hass.data:
return hass.data[DATA_RESTORE_CACHE].get(entity_id)
if (_RECORDER not in hass.config.components or
hass.state not in (CoreState.starting, CoreState.not_running)):
_LOGGER.error("Cache can only be loaded during startup, not %s",
hass.state)
return None
if _LOCK not in hass.data:
hass.data[_LOCK] = asyncio.Lock(loop=hass.loop)
@@ -63,7 +65,7 @@ def async_get_last_state(hass, entity_id: str):
yield from hass.loop.run_in_executor(
None, _load_restore_cache, hass)
return hass.data[DATA_RESTORE_CACHE].get(entity_id)
return hass.data.get(DATA_RESTORE_CACHE, {}).get(entity_id)
@asyncio.coroutine