Revert "Split ratelimiters in two (one for events, one for registration)"

This reverts commit d7dbad3526.
This commit is contained in:
Brendan Abolivier 2019-03-06 10:55:22 +00:00
parent 6fcecb4859
commit f4195f4118
9 changed files with 11 additions and 15 deletions

View file

@ -44,7 +44,7 @@ class BaseHandler(object):
self.notifier = hs.get_notifier()
self.state_handler = hs.get_state_handler()
self.distributor = hs.get_distributor()
self.ratelimiter = hs.get_events_ratelimiter()
self.ratelimiter = hs.get_ratelimiter()
self.clock = hs.get_clock()
self.hs = hs

View file

@ -224,7 +224,7 @@ class EventCreationHandler(object):
self.profile_handler = hs.get_profile_handler()
self.event_builder_factory = hs.get_event_builder_factory()
self.server_name = hs.hostname
self.ratelimiter = hs.get_events_ratelimiter()
self.ratelimiter = hs.get_ratelimiter()
self.notifier = hs.get_notifier()
self.config = hs.config

View file

@ -61,7 +61,7 @@ class RegistrationHandler(BaseHandler):
self.user_directory_handler = hs.get_user_directory_handler()
self.captcha_client = CaptchaServerHttpClient(hs)
self.identity_handler = self.hs.get_handlers().identity_handler
self.ratelimiter = hs.get_registration_ratelimiter()
self.ratelimiter = hs.get_ratelimiter()
self._next_generated_user_id = None