summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorAmber Brown <hawkowl@atleastfornow.net>2019-05-15 12:06:04 -0500
committerGitHub <noreply@github.com>2019-05-15 12:06:04 -0500
commitf1e5b413886ba4d9d0a16b028dba89c4a5cb56ac (patch)
tree590ed475c14dc2e17007a240ab3a0e3ceb9928d7 /synapse/handlers
parentDrop support for v2_alpha API prefix (#5190) (diff)
downloadsynapse-f1e5b413886ba4d9d0a16b028dba89c4a5cb56ac.tar.xz
Make all the rate limiting options more consistent (#5181)
Diffstat (limited to 'synapse/handlers')
-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,