diff options
| author | Erik Johnston <erik@matrix.org> | 2017-11-15 11:32:24 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-11-15 11:32:24 +0000 |
| commit | 552f123bea1014680ab798b7e34cd1b23424a189 (patch) | |
| tree | 71da1c70b084a38a032380f8976a0c4deef33d64 /synapse/http/servlet.py | |
| parent | Merge pull request #2598 from matrix-org/revert-2596-erikj/attestation_jitter (diff) | |
| parent | Bump changelog (diff) | |
| download | synapse-552f123bea1014680ab798b7e34cd1b23424a189.tar.xz | |
Merge branch 'release-v0.25.0' of github.com:matrix-org/synapse v0.25.0
Diffstat (limited to 'synapse/http/servlet.py')
| -rw-r--r-- | synapse/http/servlet.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/http/servlet.py b/synapse/http/servlet.py index 8118ee7cc2..71420e54db 100644 --- a/synapse/http/servlet.py +++ b/synapse/http/servlet.py @@ -167,7 +167,8 @@ def parse_json_value_from_request(request): try: content = simplejson.loads(content_bytes) - except simplejson.JSONDecodeError: + except Exception as e: + logger.warn("Unable to parse JSON: %s", e) raise SynapseError(400, "Content not JSON.", errcode=Codes.NOT_JSON) return content |