OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4362 from matrix-org/erikj/better_errors 

Use RequestSendFailed when fail to parse content type headers
pull/4387/head
Erik Johnston 2019-01-09 09:08:35 +00:00 committed by GitHub
parent c4530b97b2 d91b99abe0
commit d1d81d0651
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/4362.misc Normal file
View File

@ -0,0 +1 @@
Add better logging for unexpected errors while sending transactions

10
synapse/http/matrixfederationclient.py
View File

@ -823,21 +823,21 @@ def check_content_type_is_json(headers):
headers (twisted.web.http_headers.Headers): headers to check headers (twisted.web.http_headers.Headers): headers to check
Raises: Raises:
RuntimeError if the RequestSendFailed: if the Content-Type header is missing or isn't JSON
""" """
c_type = headers.getRawHeaders(b"Content-Type") c_type = headers.getRawHeaders(b"Content-Type")
if c_type is None: if c_type is None:
raise RuntimeError( raise RequestSendFailed(RuntimeError(
"No Content-Type header" "No Content-Type header"
) ), can_retry=False)
c_type = c_type[0].decode('ascii') # only the first header c_type = c_type[0].decode('ascii') # only the first header
val, options = cgi.parse_header(c_type) val, options = cgi.parse_header(c_type)
if val != "application/json": if val != "application/json":
raise RuntimeError( raise RequestSendFailed(RuntimeError(
"Content-Type not application/json: was '%s'" % c_type "Content-Type not application/json: was '%s'" % c_type
) ), can_retry=False)
def encode_query_args(args): def encode_query_args(args):