OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Log in the correct places

pull/2920/head
Erik Johnston 2018-03-01 12:05:33 +00:00
parent 157298f986
commit 126b9bf96f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
synapse/replication/http/send_event.py
View File

@ -72,9 +72,10 @@ def send_event_to_master(client, host, port, requester, event, context,
break break
except CodeMessageException as e: except CodeMessageException as e:
if e.code != 504: if e.code != 504:
logger.warn("send_event request timed out")
raise raise
logger.warn("send_event request timed out")
# If we timed out we probably don't need to worry about backing # If we timed out we probably don't need to worry about backing
# off too much, but lets just wait a little anyway. # off too much, but lets just wait a little anyway.
yield sleep(1) yield sleep(1)
@ -119,11 +120,12 @@ class ReplicationSendEventRestServlet(RestServlet):
def on_PUT(self, request, event_id): def on_PUT(self, request, event_id):
result = self.response_cache.get(event_id) result = self.response_cache.get(event_id)
if not result: if not result:
logger.warn("Returning cached response")
result = self.response_cache.set( result = self.response_cache.set(
event_id, event_id,
self._handle_request(request) self._handle_request(request)
) )
else:
logger.warn("Returning cached response")
return make_deferred_yieldable(result) return make_deferred_yieldable(result)
@preserve_fn @preserve_fn