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

@ -20,7 +20,6 @@ from synapse.api.constants import EventTypes, PresenceState
from synapse.config._base import ConfigError
from synapse.config.homeserver import HomeServerConfig
from synapse.config.logger import setup_logging
from synapse.config.workers import clobber_with_worker_config
from synapse.events import FrozenEvent
from synapse.handlers.presence import PresenceHandler
from synapse.http.site import SynapseSite
@ -404,6 +403,9 @@ class SynchrotronServer(HomeServer):
def build_typing_handler(self):
return SynchrotronTyping(self)
def get_event_cache_size(self):
return self.worker_config.event_cache_size
def start(worker_name, config_options):
try:
@ -418,8 +420,6 @@ def start(worker_name, config_options):
setup_logging(worker_config.log_config, worker_config.log_file)
clobber_with_worker_config(config, worker_config)
database_engine = create_engine(config.database_config)
ss = SynchrotronServer(