diff options
| author | Matthew Hodgson <matthew@arasphere.net> | 2018-07-23 10:03:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 10:03:28 +0100 |
| commit | 9b34f3ea3af233d70412565290468092cf3c5984 (patch) | |
| tree | dcfc00333a843cdc3a011249ef78f8438804dbd4 /synapse/handlers/message.py | |
| parent | add trailing comma (diff) | |
| parent | Make the rest of the .iterwhatever go away (#3562) (diff) | |
| download | synapse-9b34f3ea3af233d70412565290468092cf3c5984.tar.xz | |
Merge branch 'develop' into matthew/sync_deleted_devices
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index a39b852ceb..abc07ea87c 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -33,7 +33,7 @@ from synapse.events.utils import serialize_event from synapse.events.validator import EventValidator from synapse.replication.http.send_event import send_event_to_master from synapse.types import RoomAlias, RoomStreamToken, UserID -from synapse.util.async import Limiter, ReadWriteLock +from synapse.util.async import Linearizer, ReadWriteLock from synapse.util.frozenutils import frozendict_json_encoder from synapse.util.logcontext import run_in_background from synapse.util.metrics import measure_func @@ -427,7 +427,7 @@ class EventCreationHandler(object): # We arbitrarily limit concurrent event creation for a room to 5. # This is to stop us from diverging history *too* much. - self.limiter = Limiter(max_count=5) + self.limiter = Linearizer(max_count=5, name="room_event_creation_limit") self.action_generator = hs.get_action_generator() |