summary refs log tree commit diff
path: root/synapse/app/synctl.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-03-31 14:41:49 +0100
committerGitHub <noreply@github.com>2017-03-31 14:41:49 +0100
commit8a240e4f9cbea17916ffe9d0bf66012dd53249ff (patch)
treec5145c4818fb5d7c33f80d21d229b99e87599f2b /synapse/app/synctl.py
parentMerge pull request #1984 from RyanBreaker/patch-1 (diff)
parentadd user friendly report of assertion error in synctl.py (diff)
downloadsynapse-8a240e4f9cbea17916ffe9d0bf66012dd53249ff.tar.xz
Merge pull request #2078 from APwhitehat/assertuserfriendly
add user friendly report of assertion error in synctl.py
Diffstat (limited to 'synapse/app/synctl.py')
-rwxr-xr-xsynapse/app/synctl.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/app/synctl.py b/synapse/app/synctl.py
index 23eb6a1ec4..e8218d01ad 100755
--- a/synapse/app/synctl.py
+++ b/synapse/app/synctl.py
@@ -202,7 +202,8 @@ def main():
         worker_app = worker_config["worker_app"]
         worker_pidfile = worker_config["worker_pid_file"]
         worker_daemonize = worker_config["worker_daemonize"]
-        assert worker_daemonize  # TODO print something more user friendly
+        assert worker_daemonize, "In config %r: expected '%s' to be True" % (
+            worker_configfile, "worker_daemonize")
         worker_cache_factor = worker_config.get("synctl_cache_factor")
         workers.append(Worker(
             worker_app, worker_configfile, worker_pidfile, worker_cache_factor,