feat: Enhance dendrite error messaging#2117
Merged
thealligatorking merged 7 commits intostagingfrom Jul 18, 2024
Merged
Conversation
thewhaleking
approved these changes
Jul 11, 2024
Comment on lines
+31
to
+39
| DENDRITE_ERROR_MAPPING: Dict[Type[Exception], tuple] = { | ||
| aiohttp.ClientConnectorError: ("503", "Service unavailable"), | ||
| asyncio.TimeoutError: ("408", "Request timeout"), | ||
| aiohttp.ClientResponseError: (None, "Client response error"), | ||
| aiohttp.ClientPayloadError: ("400", "Payload error"), | ||
| aiohttp.ClientError: ("500", "Client error"), | ||
| aiohttp.ServerTimeoutError: ("504", "Server timeout error"), | ||
| aiohttp.ServerDisconnectedError: ("503", "Service disconnected"), | ||
| aiohttp.ServerConnectionError: ("503", "Service connection error"), |
Contributor
There was a problem hiding this comment.
I'm totally fine with the hard-coding here, but just for future reference, the error message is embedded in the docstring, so like aiohttp.ServerTimeoutError.__doc__.
thewhaleking
approved these changes
Jul 11, 2024
basfroman
requested changes
Jul 11, 2024
basfroman
approved these changes
Jul 18, 2024
Collaborator
basfroman
left a comment
basfroman
left a comment
There was a problem hiding this comment.
Left no blocking comment, but LGTM
| if status_code: | ||
| synapse.dendrite.status_code = status_code # type: ignore | ||
| elif isinstance(exception, aiohttp.ClientResponseError): | ||
| synapse.dendrite.status_code = str(exception.code) # type: ignore |
Collaborator
There was a problem hiding this comment.
code is deprecated for exactions. we need to use status instead of this in the future.
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary