diff --git a/synapse/config/ratelimiting.py b/synapse/config/ratelimiting.py
index 862c07ef8c..76d9970e5b 100644
--- a/synapse/config/ratelimiting.py
+++ b/synapse/config/ratelimiting.py
@@ -17,56 +17,42 @@ from ._base import Config
class RatelimitConfig(Config):
- def __init__(self, args):
- super(RatelimitConfig, self).__init__(args)
- self.rc_messages_per_second = args.rc_messages_per_second
- self.rc_message_burst_count = args.rc_message_burst_count
+ def read_config(self, config):
+ self.rc_messages_per_second = config["rc_messages_per_second"]
+ self.rc_message_burst_count = config["rc_message_burst_count"]
- self.federation_rc_window_size = args.federation_rc_window_size
- self.federation_rc_sleep_limit = args.federation_rc_sleep_limit
- self.federation_rc_sleep_delay = args.federation_rc_sleep_delay
- self.federation_rc_reject_limit = args.federation_rc_reject_limit
- self.federation_rc_concurrent = args.federation_rc_concurrent
+ self.federation_rc_window_size = config["federation_rc_window_size"]
+ self.federation_rc_sleep_limit = config["federation_rc_sleep_limit"]
+ self.federation_rc_sleep_delay = config["federation_rc_sleep_delay"]
+ self.federation_rc_reject_limit = config["federation_rc_reject_limit"]
+ self.federation_rc_concurrent = config["federation_rc_concurrent"]
- @classmethod
- def add_arguments(cls, parser):
- super(RatelimitConfig, cls).add_arguments(parser)
- rc_group = parser.add_argument_group("ratelimiting")
- rc_group.add_argument(
- "--rc-messages-per-second", type=float, default=0.2,
- help="number of messages a client can send per second"
- )
- rc_group.add_argument(
- "--rc-message-burst-count", type=float, default=10,
- help="number of message a client can send before being throttled"
- )
+ def default_config(self, config_dir_path, server_name):
+ return """\
+ ## Ratelimiting ##
- rc_group.add_argument(
- "--federation-rc-window-size", type=int, default=10000,
- help="The federation window size in milliseconds",
- )
+ # Number of messages a client can send per second
+ rc_messages_per_second: 0.2
- rc_group.add_argument(
- "--federation-rc-sleep-limit", type=int, default=10,
- help="The number of federation requests from a single server"
- " in a window before the server will delay processing the"
- " request.",
- )
+ # Number of message a client can send before being throttled
+ rc_message_burst_count: 10.0
- rc_group.add_argument(
- "--federation-rc-sleep-delay", type=int, default=500,
- help="The duration in milliseconds to delay processing events from"
- " remote servers by if they go over the sleep limit.",
- )
+ # The federation window size in milliseconds
+ federation_rc_window_size: 1000
- rc_group.add_argument(
- "--federation-rc-reject-limit", type=int, default=50,
- help="The maximum number of concurrent federation requests allowed"
- " from a single server",
- )
+ # The number of federation requests from a single server in a window
+ # before the server will delay processing the request.
+ federation_rc_sleep_limit: 10
- rc_group.add_argument(
- "--federation-rc-concurrent", type=int, default=3,
- help="The number of federation requests to concurrently process"
- " from a single server",
- )
+ # The duration in milliseconds to delay processing events from
+ # remote servers by if they go over the sleep limit.
+ federation_rc_sleep_delay: 500
+
+ # The maximum number of concurrent federation requests allowed
+ # from a single server
+ federation_rc_reject_limit: 50
+
+ # The number of federation requests to concurrently process from a
+ # single server
+ federation_rc_concurrent: 3
+ """
|
