Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More log lines.

This commit is contained in:
Erik Johnston 2014-10-17 20:58:47 +01:00
parent 3187b5ba2d
commit cd198dfea8
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
synapse/federation/transport.py
View File

@ -256,10 +256,14 @@ class TransportLayer(object):
def _with_authentication(self, handler): def _with_authentication(self, handler):
@defer.inlineCallbacks @defer.inlineCallbacks
def new_handler(request, *args, **kwargs): def new_handler(request, *args, **kwargs):
(origin, content) = yield self._authenticate_request(request) try:
response = yield handler( (origin, content) = yield self._authenticate_request(request)
origin, content, request.args, *args, **kwargs response = yield handler(
) origin, content, request.args, *args, **kwargs
)
except:
logger.exception("_authenticate_request failed")
raise
defer.returnValue(response) defer.returnValue(response)
return new_handler return new_handler
@ -392,9 +396,13 @@ class TransportLayer(object):
defer.returnValue((400, {"error": "Invalid transaction"})) defer.returnValue((400, {"error": "Invalid transaction"}))
return return
code, response = yield self.received_handler.on_incoming_transaction( try:
transaction_data code, response = yield self.received_handler.on_incoming_transaction(
) transaction_data
)
except:
logger.exception("on_incoming_transaction failed")
raise
defer.returnValue((code, response)) defer.returnValue((code, response))