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.
This commit is contained in:
Mark Haines 2016-06-16 12:53:15 +01:00
parent bde13833cb
commit 364d616792
5 changed files with 10 additions and 21 deletions

View file

@ -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"],