Skip to content

Cleanly stop tradfri on shutdown #17114

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
pvizeli merged 8 commits into from
Oct 5, 2018
Merged

Cleanly stop tradfri on shutdown #17114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
70825bb
Tradfri shutdown fix
lwis Oct 1, 2018
1a3245d
Merge remote-tracking branch 'origin/dev' into tradfri_shutdown
lwis Oct 3, 2018
add9937
Bump version
lwis Oct 3, 2018
ae6e7a6
Bump version
lwis Oct 3, 2018
a42c0a3
Fix
lwis Oct 3, 2018
6759a20
Derp
lwis Oct 4, 2018
8227c55
Remove unnecessary shutdown event
lwis Oct 4, 2018
77eefc7
Merge remote-tracking branch 'origin/dev' into tradfri_shutdown
lwis Oct 4, 2018
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
10 changes: 9 additions & 1 deletion homeassistant/components/tradfri/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import voluptuous as vol

from homeassistant import config_entries
from homeassistant.const import EVENT_HOMEASSISTANT_STOP
import homeassistant.helpers.config_validation as cv
from homeassistant.util.json import load_json

Expand All @@ -17,7 +18,7 @@

from . import config_flow # noqa pylint_disable=unused-import

REQUIREMENTS = ['pytradfri[async]==5.6.0']
REQUIREMENTS = ['pytradfri[async]==6.0.1']

DOMAIN = 'tradfri'
CONFIG_FILE = '.tradfri_psk.conf'
Expand Down Expand Up @@ -87,6 +88,13 @@ async def async_setup_entry(hass, entry):
psk=entry.data[CONF_KEY],
loop=hass.loop
)

async def on_hass_stop(event):
"""Close connection when hass stops."""
await factory.shutdown()

hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, on_hass_stop)

api = factory.request
gateway = Gateway()

Expand Down
3 changes: 3 additions & 0 deletions homeassistant/components/tradfri/config_flow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,12 @@ async def get_gateway_info(hass, host, identity, key):
psk=key,
loop=hass.loop
)

api = factory.request
gateway = Gateway()
gateway_info_result = await api(gateway.get_gateway_info())

await factory.shutdown()
except (OSError, RequestError):
# We're also catching OSError as PyTradfri doesn't catch that one yet
# Upstream PR: https://github.com/ggravlingen/pytradfri/pull/189
Expand Down
2 changes: 1 addition & 1 deletion requirements_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1217,7 +1217,7 @@ pytouchline==0.7
pytrackr==0.0.5

# homeassistant.components.tradfri
pytradfri[async]==5.6.0
pytradfri[async]==6.0.1

# homeassistant.components.sensor.trafikverket_weatherstation
pytrafikverket==0.1.5.8
Expand Down
2 changes: 1 addition & 1 deletion requirements_test_all.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ python-nest==4.0.3
pythonwhois==2.4.3

# homeassistant.components.tradfri
pytradfri[async]==5.6.0
pytradfri[async]==6.0.1

# homeassistant.components.device_tracker.unifi
pyunifi==2.13
Expand Down