Improve warning messages on invalid received modes (#77909)

This commit is contained in:
Jan Bouwhuis 2022-09-09 11:12:09 +02:00 committed by GitHub
parent 8b3ce8c58c
commit d53d59eb6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -256,7 +256,9 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
except KeyError:
pass
except ValueError:
_LOGGER.warning("Invalid RGB color value received")
_LOGGER.warning(
"Invalid RGB color value received for entity %s", self.entity_id
)
return
try:
@ -266,7 +268,9 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
except KeyError:
pass
except ValueError:
_LOGGER.warning("Invalid XY color value received")
_LOGGER.warning(
"Invalid XY color value received for entity %s", self.entity_id
)
return
try:
@ -276,12 +280,16 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
except KeyError:
pass
except ValueError:
_LOGGER.warning("Invalid HS color value received")
_LOGGER.warning(
"Invalid HS color value received for entity %s", self.entity_id
)
return
else:
color_mode = values["color_mode"]
if not self._supports_color_mode(color_mode):
_LOGGER.warning("Invalid color mode received")
_LOGGER.warning(
"Invalid color mode received for entity %s", self.entity_id
)
return
try:
if color_mode == ColorMode.COLOR_TEMP:
@ -321,7 +329,10 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
self._color_mode = ColorMode.XY
self._xy = (x, y)
except (KeyError, ValueError):
_LOGGER.warning("Invalid or incomplete color value received")
_LOGGER.warning(
"Invalid or incomplete color value received for entity %s",
self.entity_id,
)
def _prepare_subscribe_topics(self):
"""(Re)Subscribe to topics."""
@ -363,7 +374,10 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
except KeyError:
pass
except (TypeError, ValueError):
_LOGGER.warning("Invalid brightness value received")
_LOGGER.warning(
"Invalid brightness value received for entity %s",
self.entity_id,
)
if (
ColorMode.COLOR_TEMP in self._supported_color_modes
@ -378,7 +392,10 @@ class MqttLightJson(MqttEntity, LightEntity, RestoreEntity):
except KeyError:
pass
except ValueError:
_LOGGER.warning("Invalid color temp value received")
_LOGGER.warning(
"Invalid color temp value received for entity %s",
self.entity_id,
)
if self._supported_features and LightEntityFeature.EFFECT:
with suppress(KeyError):