summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-07-03 10:11:09 +0100
committerErik Johnston <erik@matrix.org>2018-07-03 10:11:09 +0100
commitbf425e533ed678c6e22e2d8655263f4ab6d1edc6 (patch)
treeba88d0925aeb3bbcd50ed8da96211ee76513e502
parentTimeout membership requests after 90s (diff)
downloadsynapse-bf425e533ed678c6e22e2d8655263f4ab6d1edc6.tar.xz
Fix PEP8
-rw-r--r--synapse/handlers/room_member.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py

index e0950288df..7d509f9e08 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py
@@ -249,11 +249,11 @@ class RoomMemberHandler(object): then = self.clock.time_msec() with (yield self.member_limiter.queue(as_id)): - diff = self.clock.time_msec() - then + diff = self.clock.time_msec() - then - if diff > 90 * 1000: - # haproxy would have timed the request out anyway... - raise SynapseError(504, "took to long to process") + if diff > 90 * 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