Fix noisy error on startup. Make callbacks code consistent.

This commit is contained in:
pavoni committed 2016-03-06 19:19:07 +00:00
1 parent b16c17fae5
commit 4e3c8a8697
3 files changed
+14 -10

No files matched your search

@@ -90,6 +90,8 @@ class BinarySensorTemplate(BinarySensorDevice):
hass.bus.listen(EVENT_STATE_CHANGED, self._event_listener) hass.bus.listen(EVENT_STATE_CHANGED, self._event_listener)
def _event_listener(self, event): def _event_listener(self, event):
if not hasattr(self, 'hass'):
return
self.update_ha_state(True) self.update_ha_state(True)
@property @property
+6 -5
View File
@@ -86,12 +86,13 @@ class SensorTemplate(Entity):
self._unit_of_measurement = unit_of_measurement self._unit_of_measurement = unit_of_measurement
self._template = state_template self._template = state_template
self.update() self.update()
self.hass.bus.listen(EVENT_STATE_CHANGED, self._event_listener)
def _update_callback(_event): def _event_listener(self, event):
""" Called when the target device changes state. """ """ Called when the target device changes state. """
self.update_ha_state(True) if not hasattr(self, 'hass'):
return
self.hass.bus.listen(EVENT_STATE_CHANGED, _update_callback) self.update_ha_state(True)
@property @property
def name(self): def name(self):
+6 -5
View File
@@ -100,12 +100,13 @@ class SwitchTemplate(SwitchDevice):
self._on_action = on_action self._on_action = on_action
self._off_action = off_action self._off_action = off_action
self.update() self.update()
self.hass.bus.listen(EVENT_STATE_CHANGED, self._event_listener)
def _update_callback(_event): def _event_listener(self, event):
"""Called when the target device changes state.""" """ Called when the target device changes state. """
self.update_ha_state(True) if not hasattr(self, 'hass'):
return
self.hass.bus.listen(EVENT_STATE_CHANGED, _update_callback) self.update_ha_state(True)
@property @property
def name(self): def name(self):