Fix the way we launch celery (needs pointer to celery app, not env file) (#23325)

This is a fix to PR #23222.
This commit is contained in:
Tim McCormack
2020-03-06 16:08:05 +00:00
committed by GitHub
parent 0c2dfd136e
commit a783690507
4 changed files with 8 additions and 5 deletions

View File

@@ -8,7 +8,7 @@ of tasks onto the appropriate workers.
In two separate processes on devstack:
paver devstack studio --settings=devstack_with_worker
celery worker --app=cms.envs.devstack_with_worker
DJANGO_SETTINGS_MODULE=cms.envs.devstack_with_worker celery worker --app=cms.celery:APP
"""

View File

@@ -8,7 +8,7 @@ of tasks onto the appropriate workers.
In two separate processes on devstack:
paver devstack lms --settings=devstack_with_worker
celery worker --app=lms.envs.devstack_with_worker
DJANGO_SETTINGS_MODULE=lms.envs.devstack_with_worker celery worker --app=lms.celery:APP
"""

View File

@@ -34,7 +34,8 @@ EXPECTED_COLLECT_STATIC_COMMAND = (
u'--noinput {log_string}'
)
EXPECTED_CELERY_COMMAND = (
u"celery worker --app=lms.envs.{settings} --beat --loglevel=INFO --pythonpath=."
u"DJANGO_SETTINGS_MODULE=lms.envs.{settings} celery worker "
u"--app=lms.celery:APP --beat --loglevel=INFO --pythonpath=."
)
EXPECTED_RUN_SERVER_COMMAND = (
u"python manage.py {system} --settings={settings} runserver --traceback --pythonpath=. 0.0.0.0:{port}"

View File

@@ -159,7 +159,8 @@ def celery(options):
Runs Celery workers.
"""
settings = getattr(options, 'settings', 'devstack_with_worker')
run_process(cmd('celery', 'worker', '--app=lms.envs.{}'.format(settings),
run_process(cmd('DJANGO_SETTINGS_MODULE=lms.envs.{}'.format(settings),
'celery', 'worker', '--app=lms.celery:APP',
'--beat', '--loglevel=INFO', '--pythonpath=.'))
@@ -236,7 +237,8 @@ def run_all_servers(options):
'studio', settings_cms, 'runserver', '--traceback', '--pythonpath=.', *cms_runserver_args
),
cmd(
'celery', 'worker', "--app=lms.envs.{}".format(worker_settings),
'DJANGO_SETTINGS_MODULE=lms.envs.{}'.format(worker_settings),
'celery', 'worker', '--app=lms.celery:APP',
'--beat', '--loglevel=INFO', '--pythonpath=.'
)
])