Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Actuall set cache factors in workers

This commit is contained in:
Erik Johnston 2018-02-21 21:09:33 +00:00 committed by Richard van der Hoff
parent c2185f14d7
commit 8834396b8a
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
synapse/app/synctl.py
View File

@ -111,7 +111,7 @@ def stop(pidfile, app):
Worker = collections.namedtuple("Worker", [ Worker = collections.namedtuple("Worker", [
"app", "configfile", "pidfile", "cache_factor" "app", "configfile", "pidfile", "cache_factor", "cache_factors",
]) ])
@ -218,6 +218,10 @@ def main():
or pidfile or pidfile
) )
worker_cache_factor = worker_config.get("synctl_cache_factor") or cache_factor worker_cache_factor = worker_config.get("synctl_cache_factor") or cache_factor
worker_cache_factors = (
worker_config.get("synctl_cache_factors")
or cache_factors
)
daemonize = worker_config.get("daemonize") or config.get("daemonize") daemonize = worker_config.get("daemonize") or config.get("daemonize")
assert daemonize, "Main process must have daemonize set to true" assert daemonize, "Main process must have daemonize set to true"
@ -233,8 +237,10 @@ def main():
assert worker_daemonize, "In config %r: expected '%s' to be True" % ( assert worker_daemonize, "In config %r: expected '%s' to be True" % (
worker_configfile, "worker_daemonize") worker_configfile, "worker_daemonize")
worker_cache_factor = worker_config.get("synctl_cache_factor") worker_cache_factor = worker_config.get("synctl_cache_factor")
worker_cache_factors = worker_config.get("synctl_cache_factors", {})
workers.append(Worker( workers.append(Worker(
worker_app, worker_configfile, worker_pidfile, worker_cache_factor, worker_app, worker_configfile, worker_pidfile, worker_cache_factor,
worker_cache_factors,
)) ))
action = options.action action = options.action
@ -269,15 +275,19 @@ def main():
start(configfile) start(configfile)
for worker in workers: for worker in workers:
env = os.environ.copy()
if worker.cache_factor: if worker.cache_factor:
os.environ["SYNAPSE_CACHE_FACTOR"] = str(worker.cache_factor) os.environ["SYNAPSE_CACHE_FACTOR"] = str(worker.cache_factor)
for cache_name, factor in worker.cache_factors.iteritems():
os.environ["SYNAPSE_CACHE_FACTOR_" + cache_name.upper()] = str(factor)
start_worker(worker.app, configfile, worker.configfile) start_worker(worker.app, configfile, worker.configfile)
if cache_factor: # Reset env back to the original
os.environ["SYNAPSE_CACHE_FACTOR"] = str(cache_factor) os.environ.clear()
else: os.environ.update(env)
os.environ.pop("SYNAPSE_CACHE_FACTOR", None)
if __name__ == "__main__": if __name__ == "__main__":