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

Better restore_state warnings (#6418)

pull/6431/head
Paulus Schoutsen 2017-03-05 01:54:49 -08:00 committed by Pascal Vizeli
parent 10bf659773
commit 7655b6271d
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
homeassistant/helpers/restore_state.py
View File

@ -54,10 +54,12 @@ def async_get_last_state(hass, entity_id: str):
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)
if _RECORDER not in hass.config.components:
return None
if hass.state not in (CoreState.starting, CoreState.not_running):
_LOGGER.debug("Cache for %s can only be loaded during startup, not %s",
entity_id, hass.state)
return None
try:
@ -83,9 +85,9 @@ def async_get_last_state(hass, entity_id: str):
@asyncio.coroutine
def async_restore_state(entity, extract_info):
"""Helper to call entity.async_restore_state with cached info."""
if entity.hass.state != CoreState.starting:
_LOGGER.debug("Not restoring state: State is not starting: %s",
entity.hass.state)
if entity.hass.state not in (CoreState.starting, CoreState.not_running):
_LOGGER.debug("Not restoring state for %s: Hass is not starting: %s",
entity.entity_id, entity.hass.state)
return
state = yield from async_get_last_state(entity.hass, entity.entity_id)