diff options
| author | Erik Johnston <erik@matrix.org> | 2015-03-19 10:43:31 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-03-19 10:43:31 +0000 |
| commit | d028207a6e421b97eae886a501e3e427577bab29 (patch) | |
| tree | 4f452dfcb656771607eac291dfe34dd4ec49f812 /synapse/rest/appservice | |
| parent | Merge branch 'release-v0.8.0' of github.com:matrix-org/synapse (diff) | |
| parent | Update CHANGES (diff) | |
| download | synapse-d028207a6e421b97eae886a501e3e427577bab29.tar.xz | |
Merge branch 'release-v0.8.1' of github.com:matrix-org/synapse v0.8.1
Diffstat (limited to 'synapse/rest/appservice')
| -rw-r--r-- | synapse/rest/appservice/v1/register.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/synapse/rest/appservice/v1/register.py b/synapse/rest/appservice/v1/register.py index a4f6159773..ea24d88f79 100644 --- a/synapse/rest/appservice/v1/register.py +++ b/synapse/rest/appservice/v1/register.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- # Copyright 2015 OpenMarket Ltd # -# Licensed under the Apache License, Version 2.0 (the "License"); +# Licensensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # @@ -89,7 +89,8 @@ def _parse_json(request): if type(content) != dict: raise SynapseError(400, "Content must be a JSON object.") return content - except ValueError: + except ValueError as e: + logger.warn(e) raise SynapseError(400, "Content not JSON.") |