mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-07 03:11:57 +00:00
Remove redundant checks on daemonize
from synctl (#7233)
We pass --daemonize on the commandline, which (since at least #4853) overrides whatever the config file, so there is no need for it to be set in the config file.
This commit is contained in:
parent
cae4121484
commit
23f8d285eb
1
changelog.d/7233.misc
Normal file
1
changelog.d/7233.misc
Normal file
@ -0,0 +1 @@
|
|||||||
|
Remove redundant checks on `daemonize` from synctl.
|
20
synctl
20
synctl
@ -117,7 +117,17 @@ def start_worker(app: str, configfile: str, worker_configfile: str) -> bool:
|
|||||||
False if there was an error starting the process
|
False if there was an error starting the process
|
||||||
"""
|
"""
|
||||||
|
|
||||||
args = [sys.executable, "-B", "-m", app, "-c", configfile, "-c", worker_configfile]
|
args = [
|
||||||
|
sys.executable,
|
||||||
|
"-B",
|
||||||
|
"-m",
|
||||||
|
app,
|
||||||
|
"-c",
|
||||||
|
configfile,
|
||||||
|
"-c",
|
||||||
|
worker_configfile,
|
||||||
|
"--daemonize",
|
||||||
|
]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
subprocess.check_call(args)
|
subprocess.check_call(args)
|
||||||
@ -266,9 +276,6 @@ def main():
|
|||||||
worker_cache_factors = (
|
worker_cache_factors = (
|
||||||
worker_config.get("synctl_cache_factors") or cache_factors
|
worker_config.get("synctl_cache_factors") or cache_factors
|
||||||
)
|
)
|
||||||
daemonize = worker_config.get("daemonize") or config.get("daemonize")
|
|
||||||
assert daemonize, "Main process must have daemonize set to true"
|
|
||||||
|
|
||||||
# The master process doesn't support using worker_* config.
|
# The master process doesn't support using worker_* config.
|
||||||
for key in worker_config:
|
for key in worker_config:
|
||||||
if key == "worker_app": # But we allow worker_app
|
if key == "worker_app": # But we allow worker_app
|
||||||
@ -278,11 +285,6 @@ def main():
|
|||||||
), "Main process cannot use worker_* config"
|
), "Main process cannot use worker_* config"
|
||||||
else:
|
else:
|
||||||
worker_pidfile = worker_config["worker_pid_file"]
|
worker_pidfile = worker_config["worker_pid_file"]
|
||||||
worker_daemonize = worker_config["worker_daemonize"]
|
|
||||||
assert worker_daemonize, "In config %r: expected '%s' to be True" % (
|
|
||||||
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", {})
|
worker_cache_factors = worker_config.get("synctl_cache_factors", {})
|
||||||
workers.append(
|
workers.append(
|
||||||
|
Loading…
Reference in New Issue
Block a user