diff options
| author | Erik Johnston <erik@matrix.org> | 2015-02-20 16:09:44 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-02-20 16:09:44 +0000 |
| commit | 7c56210f204ef735444129c4f7b2a393eb7539ec (patch) | |
| tree | b4d63cb8662fbb0ee67c2601566d470bd3a13a14 /synapse/config/server.py | |
| parent | Rename resource variable so as to not shadow module import (diff) | |
| download | synapse-7c56210f204ef735444129c4f7b2a393eb7539ec.tar.xz | |
By default set soft limit to hard limit
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index a3edf208e9..4e4892d40b 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -79,11 +79,11 @@ class ServerConfig(Config): 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 limit on the number of file " - "descriptors synapse can use. Zero " - "is used to indicate synapse should " - "not change the limit from system " - "default.") + 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") |