diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-07-20 13:11:43 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-07-20 13:11:43 +0100 |
| commit | 7c712f95bbc7f405355d5714c92d65551f64fec2 (patch) | |
| tree | 1c120e9f62a42824d496f05882c27570ac0ce58a /synapse/handlers | |
| parent | Improvements to the Limiter (diff) | |
| download | synapse-7c712f95bbc7f405355d5714c92d65551f64fec2.tar.xz | |
Combine Limiter and Linearizer
Linearizer was effectively a Limiter with max_count=1, so rather than maintaining two sets of code, let's combine them.
Diffstat (limited to 'synapse/handlers')
| -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 8c12c6990f..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, name="room_event_creation_limit") + self.limiter = Linearizer(max_count=5, name="room_event_creation_limit") self.action_generator = hs.get_action_generator() |