Skip to content

Add exception handling to ADS shutdown #19682

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MartinHjelmare merged 3 commits into from
Jan 3, 2019
Merged

Add exception handling to ADS shutdown #19682

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69d1232
Added exception handling to ADS shutdown
carstenschroeder Dec 31, 2018
21d882c
corrected whitespaces
carstenschroeder Dec 31, 2018
a2642a3
deleted blank line
carstenschroeder Jan 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions homeassistant/components/ads/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,23 @@ def __init__(self, ads_client):

def shutdown(self, *args, **kwargs):
"""Shutdown ADS connection."""
import pyads
_LOGGER.debug("Shutting down ADS")
for notification_item in self._notification_items.values():
self._client.del_device_notification(
notification_item.hnotify,
notification_item.huser
)
_LOGGER.debug(
"Deleting device notification %d, %d",
notification_item.hnotify, notification_item.huser)
self._client.close()
try:
self._client.del_device_notification(
notification_item.hnotify,
notification_item.huser
)
except pyads.ADSError as err:
_LOGGER.error(err)
try:
self._client.close()
except pyads.ADSError as err:
_LOGGER.error(err)

def register_device(self, device):
"""Register a new device."""
Expand Down