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

Improve err handling

Browse Source
This commit is contained in:
Daniel Høyer Iversen 2018-12-03 20:53:18 +01:00
parent fb12294bb7
commit df3c683023
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/components/sensor/tibber.py
View File

@ -12,6 +12,7 @@ from datetime import timedelta
import aiohttp import aiohttp
from homeassistant.components.tibber import DOMAIN as TIBBER_DOMAIN from homeassistant.components.tibber import DOMAIN as TIBBER_DOMAIN
from homeassistant.exceptions import PlatformNotReady
from homeassistant.helpers.entity import Entity from homeassistant.helpers.entity import Entity
from homeassistant.util import dt as dt_util from homeassistant.util import dt as dt_util
from homeassistant.util import Throttle from homeassistant.util import Throttle
@ -38,13 +39,17 @@ async def async_setup_platform(hass, config, async_add_entities,
for home in tibber_connection.get_homes(): for home in tibber_connection.get_homes():
try: try:
await home.update_info() await home.update_info()
except (asyncio.TimeoutError, aiohttp.ClientError): except asyncio.TimeoutError as err:
pass _LOGGER.error("Timeout connecting to Tibber home: %s ", err)
raise PlatformNotReady()
except aiohttp.ClientError as err:
_LOGGER.error("Error connecting to Tibber home: %s ", err)
raise PlatformNotReady()
dev.append(TibberSensorElPrice(home)) dev.append(TibberSensorElPrice(home))
if home.has_real_time_consumption: if home.has_real_time_consumption:
dev.append(TibberSensorRT(home)) dev.append(TibberSensorRT(home))
async_add_entities(dev, True) async_add_entities(dev, False)
class TibberSensorElPrice(Entity): class TibberSensorElPrice(Entity):

8
homeassistant/components/tibber/__init__.py
View File

@ -16,7 +16,7 @@ from homeassistant.const import (EVENT_HOMEASSISTANT_STOP, CONF_ACCESS_TOKEN,
from homeassistant.helpers import discovery from homeassistant.helpers import discovery
from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.aiohttp_client import async_get_clientsession
REQUIREMENTS = ['pyTibber==0.8.3'] REQUIREMENTS = ['pyTibber==0.8.4']
DOMAIN = 'tibber' DOMAIN = 'tibber'
@ -45,7 +45,11 @@ async def async_setup(hass, config):
try: try:
await tibber_connection.update_info() await tibber_connection.update_info()
except (asyncio.TimeoutError, aiohttp.ClientError): except asyncio.TimeoutError as err:
_LOGGER.error("Timeout connecting to Tibber: %s ", err)
return False
except aiohttp.ClientError as err:
_LOGGER.error("Error connecting to Tibber: %s ", err)
return False return False
except tibber.InvalidLogin as exp: except tibber.InvalidLogin as exp:
_LOGGER.error("Failed to login. %s", exp) _LOGGER.error("Failed to login. %s", exp)

2
requirements_all.txt
View File

@ -827,7 +827,7 @@ pyRFXtrx==0.23
pySwitchmate==0.4.4 pySwitchmate==0.4.4
# homeassistant.components.tibber # homeassistant.components.tibber
pyTibber==0.8.3 pyTibber==0.8.4
# homeassistant.components.switch.dlink # homeassistant.components.switch.dlink
pyW215==0.6.0 pyW215==0.6.0