summary refs log tree commit diff
path: root/synapse/server.py
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-09-11 15:39:38 +0100
committerGitHub <noreply@github.com>2019-09-11 15:39:38 +0100
commitcbcbfe64a2b306f0eaff74d4ceb7f2550d8b4b6a (patch)
tree8465e03c3d60c0d76aa8c77e2eb4ecd9f503a6b8 /synapse/server.py
parentClean up some code in the retry logic (#6017) (diff)
parentUpdate sample config (diff)
downloadsynapse-cbcbfe64a2b306f0eaff74d4ceb7f2550d8b4b6a.tar.xz
Merge pull request #6015 from matrix-org/erikj/ratelimit_admin_redaction
Allow use of different ratelimits for admin redactions.
Diffstat (limited to 'synapse/server.py')
-rw-r--r--synapse/server.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/synapse/server.py b/synapse/server.py

index 9e28dba2b1..1fcc7375d3 100644 --- a/synapse/server.py +++ b/synapse/server.py
@@ -221,6 +221,7 @@ class HomeServer(object): self.clock = Clock(reactor) self.distributor = Distributor() self.ratelimiter = Ratelimiter() + self.admin_redaction_ratelimiter = Ratelimiter() self.registration_ratelimiter = Ratelimiter() self.datastore = None @@ -279,6 +280,9 @@ class HomeServer(object): def get_registration_ratelimiter(self): return self.registration_ratelimiter + def get_admin_redaction_ratelimiter(self): + return self.admin_redaction_ratelimiter + def build_federation_client(self): return FederationClient(self)