summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2014-10-17 20:58:47 +0100
committerErik Johnston <erik@matrix.org>2014-10-17 20:58:47 +0100
commitcd198dfea8083132137f6c4df5129fd7bb5f7a1e (patch)
treebb1a3be4db7c94f8433f730e46c1173b6575a284 /synapse
parentadd log line for checking verifying signatures (diff)
downloadsynapse-cd198dfea8083132137f6c4df5129fd7bb5f7a1e.tar.xz
More log lines.
Diffstat (limited to 'synapse')
-rw-r--r--synapse/federation/transport.py22
1 files changed, 15 insertions, 7 deletions
diff --git a/synapse/federation/transport.py b/synapse/federation/transport.py
index 755eee8cf6..81529baee6 100644
--- a/synapse/federation/transport.py
+++ b/synapse/federation/transport.py
@@ -256,10 +256,14 @@ class TransportLayer(object):
     def _with_authentication(self, handler):
         @defer.inlineCallbacks
         def new_handler(request, *args, **kwargs):
-            (origin, content) = yield self._authenticate_request(request)
-            response = yield handler(
-                origin, content, request.args, *args, **kwargs
-            )
+            try:
+                (origin, content) = yield self._authenticate_request(request)
+                response = yield handler(
+                    origin, content, request.args, *args, **kwargs
+                )
+            except:
+                logger.exception("_authenticate_request failed")
+                raise
             defer.returnValue(response)
         return new_handler
 
@@ -392,9 +396,13 @@ class TransportLayer(object):
             defer.returnValue((400, {"error": "Invalid transaction"}))
             return
 
-        code, response = yield self.received_handler.on_incoming_transaction(
-            transaction_data
-        )
+        try:
+            code, response = yield self.received_handler.on_incoming_transaction(
+                transaction_data
+            )
+        except:
+            logger.exception("on_incoming_transaction failed")
+            raise
 
         defer.returnValue((code, response))