diff options
author | Mark Haines <mark.haines@matrix.org> | 2016-06-16 12:53:15 +0100 |
---|---|---|
committer | Mark Haines <mark.haines@matrix.org> | 2016-06-16 12:53:15 +0100 |
commit | 364d6167926d5d8b2a312e3d35623d2e05330e0a (patch) | |
tree | 20a0982d674169db75861eba08e0d76b969e8a38 /synapse/config | |
parent | Access replication_url from the worker config directly (diff) | |
download | synapse-364d6167926d5d8b2a312e3d35623d2e05330e0a.tar.xz |
Access the event_cache_size directly from the server object.
This means that the workers can override the event_cache_size directly without clobbering the value in the main synapse config.
Diffstat (limited to 'synapse/config')
-rw-r--r-- | synapse/config/workers.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/synapse/config/workers.py b/synapse/config/workers.py index f2c77ef59a..503358e03e 100644 --- a/synapse/config/workers.py +++ b/synapse/config/workers.py @@ -33,20 +33,6 @@ Worker = collections.namedtuple("Worker", [ ]) -def clobber_with_worker_config(config, worker_config): - """Overrides some of the keys of the main config with worker-specific - values. We only need to override the keys that are accessed deep - withing synapse code. Most of the keys that we want to override in - the workers are accessed in setup code that is rewritten specifically - for the workers. In that new code we can access the worker config directly, - so we don't need to override the values in the main config.""" - - # TODO: The event_cache_size is accessed in the db setup. It should be - # possible to rejigg that code so that the cache size is pulled from the - # worker config directly. - config.event_cache_size = worker_config.event_cache_size - - def read_worker_config(config): return Worker( app=config["app"], |