Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

outgoing_webhook: Simplify error handling logic. 

Structurally, exception, failure_message, and status_code are mutually
exclusive in how this function is called, and it's best for the
function's flow to represent that.
This commit is contained in:
Tim Abbott 2021-03-18 14:41:27 -07:00
parent ec28a7555c
commit 88f351cdee
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
zerver/lib/outgoing_webhook.py
View File

@ -241,23 +241,23 @@ def notify_bot_owner(
assert bot_owner is not None assert bot_owner is not None
notification_message = f"[A message]({message_url}) to your bot @_**{bot.full_name}** triggered an outgoing webhook." notification_message = f"[A message]({message_url}) to your bot @_**{bot.full_name}** triggered an outgoing webhook."
if failure_message: if exception:
notification_message += (
"\nWhen trying to send a request to the webhook service, an exception "
f"of type {type(exception).__name__} occurred:\n```\n{exception}\n```"
)
elif failure_message:
notification_message += "\n" + failure_message notification_message += "\n" + failure_message
if status_code == 407: elif status_code == 407:
notification_message += ( notification_message += (
"\nThe URL configured for the webhook is for a private or disallowed network." "\nThe URL configured for the webhook is for a private or disallowed network."
) )
elif status_code: elif status_code:
notification_message += f"\nThe webhook got a response with status code *{status_code}*." notification_message += f"\nThe webhook got a response with status code *{status_code}*."
if response_content and status_code != 407: if response_content:
notification_message += ( notification_message += (
f"\nThe response contains the following payload:\n```\n{response_content!r}\n```" f"\nThe response contains the following payload:\n```\n{response_content!r}\n```"
) )
if exception:
notification_message += (
"\nWhen trying to send a request to the webhook service, an exception "
f"of type {type(exception).__name__} occurred:\n```\n{exception}\n```"
)
message_info = dict( message_info = dict(
type="private", type="private",