summary refs log tree commit diff
path: root/synapse/handlers/_base.py
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2019-05-17 15:07:41 +0100
committerBrendan Abolivier <babolivier@matrix.org>2019-05-17 15:07:41 +0100
commitd6e2f9f9daaa41d881052b467c1366635eed502c (patch)
treec25dd06cc9b552e4a1e7c8d5866c0fa51cf1d05d /synapse/handlers/_base.py
parentMerge branch 'release-v0.99.4' into dinsic (diff)
parentLint (diff)
downloadsynapse-d6e2f9f9daaa41d881052b467c1366635eed502c.tar.xz
Merge branch 'babolivier/per_room_profiles' into dinsic dinsic_2019-05-17
Diffstat (limited to 'synapse/handlers/_base.py')
-rw-r--r--synapse/handlers/_base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/_base.py b/synapse/handlers/_base.py

index ac09d03ba9..dca337ec61 100644 --- a/synapse/handlers/_base.py +++ b/synapse/handlers/_base.py
@@ -90,8 +90,8 @@ class BaseHandler(object): messages_per_second = override.messages_per_second burst_count = override.burst_count else: - messages_per_second = self.hs.config.rc_messages_per_second - burst_count = self.hs.config.rc_message_burst_count + messages_per_second = self.hs.config.rc_message.per_second + burst_count = self.hs.config.rc_message.burst_count allowed, time_allowed = self.ratelimiter.can_do_action( user_id, time_now,