kallithea Changeset - 1d539bb18165

Changeset - 1d539bb18165

Parent rev.

Child rev.

[Not reviewed]

default

1 4 1

Thomas De Schampheleire - 7 years ago 2018-11-18 20:02:17
thomas.de_schampheleire@nokia.com

cli: convert 'gearbox celeryd' into 'kallithea-cli celery-run'

Note:
- '--' is never explicitly present in the arguments when using Click.
The click parser will take care of '--' as separator between
dash-dash-arguments and positional arguments, following standard UNIX
conventions.

5 files changed with 33 insertions and 32 deletions:

docs/setup.rst

init.d/celeryd-upstart.conf

kallithea/bin/kallithea_cli.py

kallithea/bin/kallithea_cli_celery.py

setup.py

0 comments (0 inline, 0 general)

docs/setup.rst

➞

Show inline comments

@@ @@ -304,13 +304,13 @@ and add or change the ``celery.*`` and ` @@
 Remember that the ini files use the format with '.' and not with '_' like
 Celery. So for example setting `BROKER_HOST` in Celery means setting
 `broker.host` in the configuration file.
 To start the Celery process, run::
-  gearbox celeryd -c my.ini
+  kallithea-cli celery-run -c my.ini
 Extra options to the Celery worker can be passed after ``--`` - see ``-- -h``
 for more info.
 .. note::
    Make sure you run this command from the same virtualenv, and with the same

init.d/celeryd-upstart.conf

➞

Show inline comments

@@ @@ -18,13 +18,13 @@ env HOME=/var/hg @@
 env USER=hg
 # To use group (if different from user), you must edit sudoers file and change
 # root's entry from (ALL) to (ALL:ALL)
 # env GROUP=hg
 script
-    COMMAND="/var/hg/.virtualenvs/kallithea/bin/gearbox celeryd -c $APPINI -- --pidfile=$PIDFILE"
+    COMMAND="/var/hg/.virtualenvs/kallithea/bin/kallithea-cli celery-run -c $APPINI -- --pidfile=$PIDFILE"
     if [ -z "$GROUP" ]; then
         exec sudo -u $USER $COMMAND
     else
         exec sudo -u $USER -g $GROUP $COMMAND
     fi
 end script

kallithea/bin/kallithea_cli.py

➞

Show inline comments

@@ @@ -13,12 +13,13 @@ @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # 'cli' is the main entry point for 'kallithea-cli', specified in setup.py as entry_points console_scripts
 from kallithea.bin.kallithea_cli_base import cli
 # import commands (they will add themselves to the 'cli' object)
 import kallithea.bin.kallithea_cli_celery
 import kallithea.bin.kallithea_cli_config
 import kallithea.bin.kallithea_cli_db
 import kallithea.bin.kallithea_cli_extensions
 import kallithea.bin.kallithea_cli_iis
 import kallithea.bin.kallithea_cli_index
 import kallithea.bin.kallithea_cli_ishell

kallithea/bin/kallithea_cli_celery.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import argparse
 import click
 import kallithea.bin.kallithea_cli_base as cli_base
 import kallithea
 from kallithea.lib.paster_commands.common import BasePasterCommand
 __all__ = ['Command']
 class Command(BasePasterCommand):
     """Kallithea: Celery worker for asynchronous tasks"""
     # Starts the celery worker using configuration from a paste.deploy
     # configuration file.
 @cli_base.register_command(config_file_initialize_app=True)
 @click.argument('celery_args', nargs=-1)
 def celery_run(celery_args):
     """Start Celery worker(s) for asynchronous tasks.
     def take_action(self, args):
         if not kallithea.CELERY_ON:
             raise Exception('Please set use_celery = true in .ini config '
                             'file before running celeryd')
     This commands starts the Celery daemon which will spawn workers to handle
     certain asynchronous tasks for Kallithea.
         from kallithea.lib import celerypylons
         cmd = celerypylons.worker.worker(celerypylons.app)
         celery_args = args.celery_args
         if '--' in celery_args:
             celery_args.remove('--')
         return cmd.run_from_argv('kallithea celery worker', celery_args)
     Any extra arguments you pass to this command will be passed through to
     Celery. Use '--' before such extra arguments to avoid options to be parsed
     by this CLI command.
     """
     def get_parser(self, prog_name):
         parser = super(Command, self).get_parser(prog_name)
     if not kallithea.CELERY_ON:
         raise Exception('Please set use_celery = true in .ini config '
                         'file before running this command')
         parser.add_argument('celery_args', nargs=argparse.REMAINDER,
             help="Pass extra options to Celery after a '--' separator",
+            )
         return parser
     from kallithea.lib import celerypylons
     cmd = celerypylons.worker.worker(celerypylons.app)
     return cmd.run_from_argv('kallithea celery worker', celery_args)

setup.py

➞

Show inline comments

@@ @@ -156,10 +156,9 @@ setuptools.setup( @@
     kallithea-cli =    kallithea.bin.kallithea_cli:cli
     [paste.app_factory]
     main = kallithea.config.middleware:make_app
     [gearbox.commands]
     celeryd=kallithea.lib.paster_commands.celeryd:Command
     upgrade-db=kallithea.lib.dbmigrate:UpgradeDb
     """,
+)

0 comments (0 inline, 0 general)