diff options
| author | Krombel <krombel@krombel.de> | 2017-05-16 15:29:59 +0200 |
|---|---|---|
| committer | Krombel <krombel@krombel.de> | 2017-05-16 15:29:59 +0200 |
| commit | 55af207321cc572b040de521f61e087b4d51e078 (patch) | |
| tree | f157863bf90299357e9f7c2205197edfb3922aa0 /synapse/config/server.py | |
| parent | avoid access-error if no filter_id matches (diff) | |
| parent | Merge pull request #2218 from matrix-org/rav/event_search_index (diff) | |
| download | synapse-55af207321cc572b040de521f61e087b4d51e078.tar.xz | |
Merge branch 'develop' into avoid_duplicate_filters
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: |