summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-18 13:57:55 +0000
committerErik Johnston <erik@matrix.org>2015-02-18 13:57:55 +0000
commita7925259a15f2995af2fedc2a8c59cdabd78b963 (patch)
tree079f8fefaf9ae250d13bb3d3ec888cc16356a577 /synapse/rest
parentAdd errback to all deferreds in transaction_queue (diff)
parentMerge pull request #80 from matrix-org/restrict-destinations (diff)
downloadsynapse-a7925259a15f2995af2fedc2a8c59cdabd78b963.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.7.1
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/media/v1/base_resource.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/rest/media/v1/base_resource.py b/synapse/rest/media/v1/base_resource.py
index d44d5f1298..b10cbddb81 100644
--- a/synapse/rest/media/v1/base_resource.py
+++ b/synapse/rest/media/v1/base_resource.py
@@ -54,7 +54,7 @@ class BaseMediaResource(Resource):
             try:
                 yield request_handler(self, request)
             except CodeMessageException as e:
-                logger.exception(e)
+                logger.info("Responding with error: %r", e)
                 respond_with_json(
                     request, e.code, cs_exception(e), send_cors=True
                 )