diff options
| author | Erik Johnston <erik@matrix.org> | 2017-05-17 11:25:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-05-17 11:25:23 +0100 |
| commit | ac08316548cf02c5991d455e96915959af603e0e (patch) | |
| tree | 6d4028791cc5656b90be063abdc2f7b2e73f68f4 /synapse/config/server.py | |
| parent | Bump version and changelog (diff) | |
| parent | Merge pull request #2228 from matrix-org/erikj/speed_up_get_hosts (diff) | |
| download | synapse-ac08316548cf02c5991d455e96915959af603e0e.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.21.0
Diffstat (limited to 'synapse/config/server.py')
| -rw-r--r-- | synapse/config/server.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index 25e6666238..3910b9dc31 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -35,6 +35,8 @@ class ServerConfig(Config): # "disable" federation self.send_federation = config.get("send_federation", True) + self.filter_timeline_limit = config.get("filter_timeline_limit", -1) + if self.public_baseurl is not None: if self.public_baseurl[-1] != '/': self.public_baseurl += '/' @@ -161,6 +163,10 @@ class ServerConfig(Config): # The GC threshold parameters to pass to `gc.set_threshold`, if defined # gc_thresholds: [700, 10, 10] + # Set the limit on the returned events in the timeline in the get + # and sync operations. The default value is -1, means no upper limit. + # filter_timeline_limit: 5000 + # List of ports that Synapse should listen on, their purpose and their # configuration. listeners: |