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

Remove no-longer-needed SimpliSafe websocket watchdog (#32129)

Browse Source 
* Fix SimpliSafe reconnection issue upon websocket error

* Rename listener cancelation properties

* Remove watchdog
This commit is contained in:
Aaron Bach 2020-02-23 20:47:19 -07:00 committed by GitHub
parent 5ec7d07283
commit 6e6625e1ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
homeassistant/components/simplisafe/__init__.py
View File

@ -3,7 +3,7 @@ import asyncio
import logging import logging
from simplipy import API from simplipy import API
from simplipy.errors import InvalidCredentialsError, SimplipyError, WebsocketError from simplipy.errors import InvalidCredentialsError, SimplipyError
from simplipy.websocket import ( from simplipy.websocket import (
EVENT_CAMERA_MOTION_DETECTED, EVENT_CAMERA_MOTION_DETECTED,
EVENT_DOORBELL_DETECTED, EVENT_DOORBELL_DETECTED,
@ -34,7 +34,7 @@ from homeassistant.helpers.dispatcher import (
async_dispatcher_send, async_dispatcher_send,
) )
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
from homeassistant.helpers.event import async_call_later, async_track_time_interval from homeassistant.helpers.event import async_track_time_interval
from homeassistant.helpers.service import ( from homeassistant.helpers.service import (
async_register_admin_service, async_register_admin_service,
verify_domain_control, verify_domain_control,
@ -68,7 +68,6 @@ EVENT_SIMPLISAFE_EVENT = "SIMPLISAFE_EVENT"
EVENT_SIMPLISAFE_NOTIFICATION = "SIMPLISAFE_NOTIFICATION" EVENT_SIMPLISAFE_NOTIFICATION = "SIMPLISAFE_NOTIFICATION"
DEFAULT_SOCKET_MIN_RETRY = 15 DEFAULT_SOCKET_MIN_RETRY = 15
DEFAULT_WATCHDOG_SECONDS = 5 * 60
WEBSOCKET_EVENTS_REQUIRING_SERIAL = [EVENT_LOCK_LOCKED, EVENT_LOCK_UNLOCKED] WEBSOCKET_EVENTS_REQUIRING_SERIAL = [EVENT_LOCK_LOCKED, EVENT_LOCK_UNLOCKED]
WEBSOCKET_EVENTS_TO_TRIGGER_HASS_EVENT = [ WEBSOCKET_EVENTS_TO_TRIGGER_HASS_EVENT = [
@ -332,46 +331,12 @@ class SimpliSafeWebsocket:
"""Initialize.""" """Initialize."""
self._hass = hass self._hass = hass
self._websocket = websocket self._websocket = websocket
self._websocket_reconnect_delay = DEFAULT_SOCKET_MIN_RETRY
self._websocket_reconnect_underway = False
self._websocket_watchdog_listener = None
self.last_events = {} self.last_events = {}
async def _async_attempt_websocket_connect(self): @staticmethod
"""Attempt to connect to the websocket (retrying later on fail).""" def _on_connect():
self._websocket_reconnect_underway = True
try:
await self._websocket.async_connect()
except WebsocketError as err:
_LOGGER.error("Error with the websocket connection: %s", err)
self._websocket_reconnect_delay = min(
2 * self._websocket_reconnect_delay, 480
)
async_call_later(
self._hass,
self._websocket_reconnect_delay,
self.async_websocket_connect,
)
else:
self._websocket_reconnect_delay = DEFAULT_SOCKET_MIN_RETRY
self._websocket_reconnect_underway = False
async def _async_websocket_reconnect(self, event_time):
"""Forcibly disconnect from and reconnect to the websocket."""
_LOGGER.debug("Websocket watchdog expired; forcing socket reconnection")
await self.async_websocket_disconnect()
await self._async_attempt_websocket_connect()
def _on_connect(self):
"""Define a handler to fire when the websocket is connected.""" """Define a handler to fire when the websocket is connected."""
_LOGGER.info("Connected to websocket") _LOGGER.info("Connected to websocket")
_LOGGER.debug("Websocket watchdog starting")
if self._websocket_watchdog_listener is not None:
self._websocket_watchdog_listener()
self._websocket_watchdog_listener = async_call_later(
self._hass, DEFAULT_WATCHDOG_SECONDS, self._async_websocket_reconnect
)
@staticmethod @staticmethod
def _on_disconnect(): def _on_disconnect():
@ -384,13 +349,6 @@ class SimpliSafeWebsocket:
self.last_events[event.system_id] = event self.last_events[event.system_id] = event
async_dispatcher_send(self._hass, TOPIC_UPDATE.format(event.system_id)) async_dispatcher_send(self._hass, TOPIC_UPDATE.format(event.system_id))
_LOGGER.debug("Resetting websocket watchdog")
self._websocket_watchdog_listener()
self._websocket_watchdog_listener = async_call_later(
self._hass, DEFAULT_WATCHDOG_SECONDS, self._async_websocket_reconnect
)
self._websocket_reconnect_delay = DEFAULT_SOCKET_MIN_RETRY
if event.event_type not in WEBSOCKET_EVENTS_TO_TRIGGER_HASS_EVENT: if event.event_type not in WEBSOCKET_EVENTS_TO_TRIGGER_HASS_EVENT:
return return
@ -415,18 +373,11 @@ class SimpliSafeWebsocket:
async def async_websocket_connect(self): async def async_websocket_connect(self):
"""Register handlers and connect to the websocket.""" """Register handlers and connect to the websocket."""
if self._websocket_reconnect_underway:
return
self._websocket.on_connect(self._on_connect) self._websocket.on_connect(self._on_connect)
self._websocket.on_disconnect(self._on_disconnect) self._websocket.on_disconnect(self._on_disconnect)
self._websocket.on_event(self._on_event) self._websocket.on_event(self._on_event)
await self._async_attempt_websocket_connect() await self._websocket.async_connect()
async def async_websocket_disconnect(self):
"""Disconnect from the websocket."""
await self._websocket.async_disconnect()
class SimpliSafe: class SimpliSafe: