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

Do not report on shutting down errors (#4431)

Browse Source 
* Do not report on shutting down errors

* Lint
This commit is contained in:
Paulus Schoutsen 2016-11-17 12:02:43 -08:00 committed by GitHub
parent b615b3349f
commit 726bc5b670
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/core.py
View File

@ -30,7 +30,7 @@ from homeassistant.const import (
EVENT_TIME_CHANGED, MATCH_ALL, RESTART_EXIT_CODE, EVENT_TIME_CHANGED, MATCH_ALL, RESTART_EXIT_CODE,
SERVICE_HOMEASSISTANT_RESTART, SERVICE_HOMEASSISTANT_STOP, __version__) SERVICE_HOMEASSISTANT_RESTART, SERVICE_HOMEASSISTANT_STOP, __version__)
from homeassistant.exceptions import ( from homeassistant.exceptions import (
HomeAssistantError, InvalidEntityFormatError) HomeAssistantError, InvalidEntityFormatError, ShuttingDown)
from homeassistant.util.async import ( from homeassistant.util.async import (
run_coroutine_threadsafe, run_callback_threadsafe) run_coroutine_threadsafe, run_callback_threadsafe)
import homeassistant.util as util import homeassistant.util as util
@ -309,6 +309,10 @@ class HomeAssistant(object):
kwargs = {} kwargs = {}
exception = context.get('exception') exception = context.get('exception')
if exception: if exception:
# Do not report on shutting down exceptions.
if isinstance(exception, ShuttingDown):
return
kwargs['exc_info'] = (type(exception), exception, kwargs['exc_info'] = (type(exception), exception,
exception.__traceback__) exception.__traceback__)
@ -422,7 +426,7 @@ class EventBus(object):
""" """
if event_type != EVENT_HOMEASSISTANT_STOP and \ if event_type != EVENT_HOMEASSISTANT_STOP and \
self._hass.state == CoreState.stopping: self._hass.state == CoreState.stopping:
raise HomeAssistantError('Home Assistant is shutting down.') raise ShuttingDown('Home Assistant is shutting down.')
# Copy the list of the current listeners because some listeners # Copy the list of the current listeners because some listeners
# remove themselves as a listener while being executed which # remove themselves as a listener while being executed which
@ -1172,7 +1176,7 @@ def _async_create_timer(hass, interval=TIMER_INTERVAL):
EVENT_TIME_CHANGED, EVENT_TIME_CHANGED,
{ATTR_NOW: now} {ATTR_NOW: now}
) )
except HomeAssistantError: except ShuttingDown:
# HA raises error if firing event after it has shut down # HA raises error if firing event after it has shut down
break break

6
homeassistant/exceptions.py
View File

@ -7,6 +7,12 @@ class HomeAssistantError(Exception):
pass pass
class ShuttingDown(HomeAssistantError):
"""When trying to change something during shutdown."""
pass
class InvalidEntityFormatError(HomeAssistantError): class InvalidEntityFormatError(HomeAssistantError):
"""When an invalid formatted entity is encountered.""" """When an invalid formatted entity is encountered."""