jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-04-23 16:57:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed exception logging, and updated excluded device logic

Browse Source
This commit is contained in:
jamespcole 2015-03-09 09:11:59 +11:00
parent 7ee37648d8
commit 56622596e7
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/components/light/vera.py
View File

@ -78,17 +78,15 @@ def setup_platform(hass, config, add_devices_callback, discovery_info=None):
devices = []
try:
devices = controller.get_devices('Switch')
except RequestException as inst:
except RequestException:
# There was a network related error connecting to the vera controller
_LOGGER.error("Could not find Vera lights: %s", inst)
_LOGGER.exception("Error communicating with Vera API")
return False
lights = []
for device in devices:
extra_data = device_data.get(device.deviceId, None)
exclude = False
if extra_data:
exclude = extra_data.get('exclude', False)
extra_data = device_data.get(device.deviceId, {})
exclude = extra_data.get('exclude', False)
if exclude is not True:
lights.append(VeraSwitch(device, extra_data))

10
homeassistant/components/sensor/vera.py
View File

@ -78,17 +78,15 @@ def get_devices(hass, config):
devices = []
try:
devices = vera_controller.get_devices(categories)
except RequestException as inst:
except RequestException:
# There was a network related error connecting to the vera controller
_LOGGER.error("Could not find Vera sensors: %s", inst)
_LOGGER.exception("Error communicating with Vera API")
return False
vera_sensors = []
for device in devices:
extra_data = device_data.get(device.deviceId, None)
exclude = False
if extra_data:
exclude = extra_data.get('exclude', False)
extra_data = device_data.get(device.deviceId, {})
exclude = extra_data.get('exclude', False)
if exclude is not True:
vera_sensors.append(VeraSensor(device, extra_data))

10
homeassistant/components/switch/vera.py
View File

@ -79,17 +79,15 @@ def get_devices(hass, config):
devices = []
try:
devices = vera_controller.get_devices(['Switch', 'Armable Sensor'])
except RequestException as inst:
except RequestException:
# There was a network related error connecting to the vera controller
_LOGGER.error("Could not find Vera switches: %s", inst)
_LOGGER.exception("Error communicating with Vera API")
return False
vera_switches = []
for device in devices:
extra_data = device_data.get(device.deviceId, None)
exclude = False
if extra_data:
exclude = extra_data.get('exclude', False)
extra_data = device_data.get(device.deviceId, {})
exclude = extra_data.get('exclude', False)
if exclude is not True:
vera_switches.append(VeraSwitch(device, extra_data))