From 27eb4c45cda26a6d4d02351a8fa7a3cd07c4ab7f Mon Sep 17 00:00:00 2001 From: hera Date: Mon, 23 Jul 2018 15:16:36 +0000 Subject: [PATCH] Lower hacky timeout for member limiter --- synapse/handlers/room_member.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py index 5b91105176..4872796a31 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py @@ -251,14 +251,14 @@ class RoomMemberHandler(object): with (yield self.member_limiter.queue(as_id)): diff = self.clock.time_msec() - then - if diff > 90 * 1000: + if diff > 80 * 1000: # haproxy would have timed the request out anyway... raise SynapseError(504, "took to long to process") with (yield self.member_linearizer.queue(key)): diff = self.clock.time_msec() - then - if diff > 90 * 1000: + if diff > 80 * 1000: # haproxy would have timed the request out anyway... raise SynapseError(504, "took to long to process")