summary refs log tree commit diff
diff options
context:
space:
mode:
authorhera <matrix@template.upcloud.com>2018-07-23 15:22:47 +0000
committerhera <matrix@template.upcloud.com>2018-07-23 15:22:47 +0000
commite43eb47c5f73288188677cc53ffffadb3a62a34e (patch)
tree40760f3841df657049d4165f7680880ad78e31f4
parentLower hacky timeout for member limiter (diff)
downloadsynapse-e43eb47c5f73288188677cc53ffffadb3a62a34e.tar.xz
Fixup limiter
-rw-r--r--synapse/handlers/room_member.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py

index 4872796a31..6184737cd4 100644 --- a/synapse/handlers/room_member.py +++ b/synapse/handlers/room_member.py
@@ -30,7 +30,7 @@ import synapse.types from synapse.api.constants import EventTypes, Membership from synapse.api.errors import AuthError, Codes, SynapseError from synapse.types import RoomID, UserID -from synapse.util.async import Limiter, Linearizer +from synapse.util.async import Linearizer from synapse.util.distributor import user_joined_room, user_left_room logger = logging.getLogger(__name__) @@ -66,7 +66,7 @@ class RoomMemberHandler(object): self.event_creation_hander = hs.get_event_creation_handler() self.member_linearizer = Linearizer(name="member") - self.member_limiter = Limiter(10) + self.member_limiter = Linearizer(max_count=10, name="member_as_limiter") self.clock = hs.get_clock() self.spam_checker = hs.get_spam_checker()