diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2019-03-19 10:06:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-19 10:06:40 +0000 |
| commit | fd463b4f5db3fb164505bc2b2300c6a5f73c73e4 (patch) | |
| tree | 5191eb24d335448e701abd326956c55dfc9d4fa1 /synapse/config/server.py | |
| parent | Migrate the user directory initial population to a background task (#4864) (diff) | |
| download | synapse-fd463b4f5db3fb164505bc2b2300c6a5f73c73e4.tar.xz | |
Comment out most options in the generated config. (#4863)
Make it so that most options in the config are optional, and commented out in the generated config. The reasons this is a good thing are as follows: * If we decide that we should change the default for an option, we can do so, and only those admins that have deliberately chosen to override that option will be stuck on the old setting. * It moves us towards a point where we can get rid of the super-surprising feature of synapse where the default settings for the config come from the generated yaml. * It makes setting up a test config for unit testing an order of magnitude easier (see forthcoming PR). * It makes the generated config more consistent, and hopefully easier for users to understand.
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 35a322fee0..499eb30bea 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -45,7 +45,7 @@ class ServerConfig(Config): self.pid_file = self.abspath(config.get("pid_file")) self.web_client_location = config.get("web_client_location", None) - self.soft_file_limit = config["soft_file_limit"] + self.soft_file_limit = config.get("soft_file_limit", 0) self.daemonize = config.get("daemonize") self.print_pidfile = config.get("print_pidfile") self.user_agent_suffix = config.get("user_agent_suffix") @@ -307,11 +307,11 @@ class ServerConfig(Config): # Zero is used to indicate synapse should set the soft limit to the # hard limit. # - soft_file_limit: 0 + #soft_file_limit: 0 # Set to false to disable presence tracking on this homeserver. # - use_presence: true + #use_presence: false # The GC threshold parameters to pass to `gc.set_threshold`, if defined # |