diff options
| author | Erik Johnston <erik@matrix.org> | 2018-07-23 13:21:15 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-07-23 13:21:15 +0100 |
| commit | 0b0b24cb82d3337bef5d3dd4b960990934d8d5c5 (patch) | |
| tree | 3cbf0143b30ef340a91a99f5d491ee2eb7aa5e8c /synapse/handlers/message.py | |
| parent | Update docs/workers.rst (diff) | |
| parent | Merge pull request #3520 from matrix-org/matthew/sync_deleted_devices (diff) | |
| download | synapse-0b0b24cb82d3337bef5d3dd4b960990934d8d5c5.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/client_apis_move
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 ba3c4642bc..7030d8beab 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -32,7 +32,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, UserID -from synapse.util.async import Limiter +from synapse.util.async import Linearizer from synapse.util.frozenutils import frozendict_json_encoder from synapse.util.logcontext import run_in_background from synapse.util.metrics import measure_func @@ -180,7 +180,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() |