diff options
| author | David Baker <dave@matrix.org> | 2015-03-04 14:56:41 +0000 |
|---|---|---|
| committer | David Baker <dave@matrix.org> | 2015-03-04 14:56:41 +0000 |
| commit | 92b3dc3219ccabc6997c66197a3b879dc49f5597 (patch) | |
| tree | 083acae90fadadf500918d58754a628feff86351 /synapse/config/server.py | |
| parent | Use if not results rather than len, as per feedback. (diff) | |
| parent | Fix upgrade instructions (diff) | |
| download | synapse-92b3dc3219ccabc6997c66197a3b879dc49f5597.tar.xz | |
Merge branch 'develop' into pushrules2
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 31e44cc857..4e4892d40b 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -31,6 +31,7 @@ class ServerConfig(Config): self.webclient = True self.manhole = args.manhole self.no_tls = args.no_tls + self.soft_file_limit = args.soft_file_limit if not args.content_addr: host = args.server_name @@ -77,6 +78,12 @@ class ServerConfig(Config): "content repository") server_group.add_argument("--no-tls", action='store_true', help="Don't bind to the https port.") + server_group.add_argument("--soft-file-limit", type=int, default=0, + help="Set the soft limit on the number of " + "file descriptors synapse can use. " + "Zero is used to indicate synapse " + "should set the soft limit to the hard" + "limit.") def read_signing_key(self, signing_key_path): signing_keys = self.read_file(signing_key_path, "signing_key") |