1
0
mirror of https://github.com/home-assistant/core.git synced 2025-12-24 12:59:34 +00:00
This commit is contained in:
Paulus Schoutsen
2019-07-31 12:25:30 -07:00
parent da05dfe708
commit 4de97abc3a
2676 changed files with 163166 additions and 140084 deletions

View File

@@ -56,29 +56,36 @@ class ActiveConnection:
try:
msg = messages.MINIMAL_MESSAGE_SCHEMA(msg)
cur_id = msg['id']
cur_id = msg["id"]
except vol.Invalid:
self.logger.error('Received invalid command', msg)
self.send_message(messages.error_message(
msg.get('id'), const.ERR_INVALID_FORMAT,
'Message incorrectly formatted.'))
self.logger.error("Received invalid command", msg)
self.send_message(
messages.error_message(
msg.get("id"),
const.ERR_INVALID_FORMAT,
"Message incorrectly formatted.",
)
)
return
if cur_id <= self.last_id:
self.send_message(messages.error_message(
cur_id, const.ERR_ID_REUSE,
'Identifier values have to increase.'))
self.send_message(
messages.error_message(
cur_id, const.ERR_ID_REUSE, "Identifier values have to increase."
)
)
return
if msg['type'] not in handlers:
self.logger.error(
'Received invalid command: {}'.format(msg['type']))
self.send_message(messages.error_message(
cur_id, const.ERR_UNKNOWN_COMMAND,
'Unknown command.'))
if msg["type"] not in handlers:
self.logger.error("Received invalid command: {}".format(msg["type"]))
self.send_message(
messages.error_message(
cur_id, const.ERR_UNKNOWN_COMMAND, "Unknown command."
)
)
return
handler, schema = handlers[msg['type']]
handler, schema = handlers[msg["type"]]
try:
handler(self.hass, self, schema(msg))
@@ -98,17 +105,16 @@ class ActiveConnection:
"""Handle an exception while processing a handler."""
if isinstance(err, Unauthorized):
code = const.ERR_UNAUTHORIZED
err_message = 'Unauthorized'
err_message = "Unauthorized"
elif isinstance(err, vol.Invalid):
code = const.ERR_INVALID_FORMAT
err_message = vol.humanize.humanize_error(msg, err)
elif isinstance(err, asyncio.TimeoutError):
code = const.ERR_TIMEOUT
err_message = 'Timeout'
err_message = "Timeout"
else:
code = const.ERR_UNKNOWN_ERROR
err_message = 'Unknown error'
err_message = "Unknown error"
self.logger.exception('Error handling message: %s', err_message)
self.send_message(
messages.error_message(msg['id'], code, err_message))
self.logger.exception("Error handling message: %s", err_message)
self.send_message(messages.error_message(msg["id"], code, err_message))