# HG changeset patch # User Thomas De Schampheleire # Date 2018-11-22 22:27:14 # Node ID f4a9f7a7d03008463f0878004763c2ef10aa2005 # Parent 2917d2be0106c5b26a280910b5e54bcad66bb747 cli: fix celery-run usage text Make sure that the help text and error messages from Celery (e.g. from 'kallithea-cli celery-run -c my.ini -- --help' or '-- -xyz') contain a valid 'Usage:' string. Without these changes, the usage string will use the arbitrary description from 2c3d30095d5e and a full path: Usage: kallithea celery worker .../bin/kallithea-cli [options] With the changes, it becomes: Usage: kallithea-cli celery-run -c CONFIG_FILE -- [options] Click will let optparse find 'kallithea-cli' from argv[0]. The command part 'celery-run -c CONFIG_FILE --' could perhaps be found with Click introspection, but it is simpler and perhaps equally reliable to make it explicit. Original change modified by Mads Kiilerich. diff --git a/kallithea/bin/kallithea_cli_celery.py b/kallithea/bin/kallithea_cli_celery.py --- a/kallithea/bin/kallithea_cli_celery.py +++ b/kallithea/bin/kallithea_cli_celery.py @@ -36,4 +36,4 @@ def celery_run(celery_args): from kallithea.lib import celerypylons cmd = celerypylons.worker.worker(celerypylons.app) - return cmd.run_from_argv('kallithea celery worker', list(celery_args)) + return cmd.run_from_argv(None, command='celery-run -c CONFIG_FILE --', argv=list(celery_args))