From 23f8d285ebd36d4091c2a03831d0b7c825f12e7e Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Wed, 8 Apr 2020 11:59:47 +0100
Subject: [PATCH] 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.
---
changelog.d/7233.misc | 1 +
synctl | 20 +++++++++++---------
2 files changed, 12 insertions(+), 9 deletions(-)
create mode 100644 changelog.d/7233.misc
diff --git a/changelog.d/7233.misc b/changelog.d/7233.misc
new file mode 100644
index 0000000000..d9ad582726
--- /dev/null
+++ b/changelog.d/7233.misc
@@ -0,0 +1 @@
+Remove redundant checks on `daemonize` from synctl.
diff --git a/synctl b/synctl
index 45acece30b..bbccd05290 100755
--- a/synctl
+++ b/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
"""
- args = [sys.executable, "-B", "-m", app, "-c", configfile, "-c", worker_configfile]
+ args = [
+ sys.executable,
+ "-B",
+ "-m",
+ app,
+ "-c",
+ configfile,
+ "-c",
+ worker_configfile,
+ "--daemonize",
+ ]
try:
subprocess.check_call(args)
@@ -266,9 +276,6 @@ def main():
worker_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.
for key in worker_config:
if key == "worker_app": # But we allow worker_app
@@ -278,11 +285,6 @@ def main():
), "Main process cannot use worker_* config"
else:
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_factors = worker_config.get("synctl_cache_factors", {})
workers.append(
--
GitLab