jeena/home-assistant
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Cloud unauth (#12840)

Browse source 
* Handle expired refresh token better

* Retry less aggressive

* Newline
This commit is contained in:
Paulus Schoutsen 2018-03-02 10:33:05 -08:00 • committed by GitHub
parent 7a979e9f72
commit 228b030c82
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 37 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
homeassistant/components/cloud/iot.py
View file

@ -10,7 +10,7 @@ from homeassistant.components.google_assistant import smart_home as ga
from homeassistant.util.decorator import Registry
from homeassistant.helpers.aiohttp_client import async_get_clientsession
from . import auth_api
from .const import MESSAGE_EXPIRATION
from .const import MESSAGE_EXPIRATION, MESSAGE_AUTH_FAIL
HANDLERS = Registry()
_LOGGER = logging.getLogger(__name__)
@ -77,9 +77,9 @@ class CloudIoT:
self.tries += 1
try:
# Sleep 0, 5, 10, 15 ... 30 seconds between retries
# Sleep 2^tries seconds between retries
self.retry_task = hass.async_add_job(asyncio.sleep(
min(30, (self.tries - 1) * 5), loop=hass.loop))
2**min(9, self.tries), loop=hass.loop))
yield from self.retry_task
self.retry_task = None
except asyncio.CancelledError:
@ -97,13 +97,23 @@ class CloudIoT:
try:
yield from hass.async_add_job(auth_api.check_token, self.cloud)
except auth_api.Unauthenticated as err:
_LOGGER.error('Unable to refresh token: %s', err)
hass.components.persistent_notification.async_create(
MESSAGE_AUTH_FAIL, 'Home Assistant Cloud',
'cloud_subscription_expired')
# Don't await it because it will cancel this task
hass.async_add_job(self.cloud.logout())
return
except auth_api.CloudError as err:
_LOGGER.warning("Unable to connect: %s", err)
_LOGGER.warning("Unable to refresh token: %s", err)
return
if self.cloud.subscription_expired:
hass.components.persistent_notification.async_create(
MESSAGE_EXPIRATION, 'Subscription expired',
MESSAGE_EXPIRATION, 'Home Assistant Cloud',
'cloud_subscription_expired')
self.close_requested = True
return