Lower hacky timeout for member limiter
This commit is contained in:
parent
b136d7ff8f
commit
27eb4c45cd
|
@ -251,14 +251,14 @@ class RoomMemberHandler(object):
|
||||||
with (yield self.member_limiter.queue(as_id)):
|
with (yield self.member_limiter.queue(as_id)):
|
||||||
diff = self.clock.time_msec() - then
|
diff = self.clock.time_msec() - then
|
||||||
|
|
||||||
if diff > 90 * 1000:
|
if diff > 80 * 1000:
|
||||||
# haproxy would have timed the request out anyway...
|
# haproxy would have timed the request out anyway...
|
||||||
raise SynapseError(504, "took to long to process")
|
raise SynapseError(504, "took to long to process")
|
||||||
|
|
||||||
with (yield self.member_linearizer.queue(key)):
|
with (yield self.member_linearizer.queue(key)):
|
||||||
diff = self.clock.time_msec() - then
|
diff = self.clock.time_msec() - then
|
||||||
|
|
||||||
if diff > 90 * 1000:
|
if diff > 80 * 1000:
|
||||||
# haproxy would have timed the request out anyway...
|
# haproxy would have timed the request out anyway...
|
||||||
raise SynapseError(504, "took to long to process")
|
raise SynapseError(504, "took to long to process")
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue