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

@ -18,7 +18,6 @@ import synapse
from synapse.server import HomeServer
from synapse.config._base import ConfigError
from synapse.config.workers import clobber_with_worker_config
from synapse.config.logger import setup_logging
from synapse.config.homeserver import HomeServerConfig
from synapse.http.site import SynapseSite
@ -241,6 +240,9 @@ class PusherServer(HomeServer):
logger.exception("Error replicating from %r", replication_url)
yield sleep(30)
def get_event_cache_size(self):
return self.worker_config.event_cache_size
def setup(worker_name, config_options):
try:
@ -255,8 +257,6 @@ def setup(worker_name, config_options):
setup_logging(worker_config.log_config, worker_config.log_file)
clobber_with_worker_config(config, worker_config)
if config.start_pushers:
sys.stderr.write(
"\nThe pushers must be disabled in the main synapse process"