diff --git a/template/backend/config/__init__.py b/template/backend/config/__init__.py index b30ebd5..67ac0c2 100644 --- a/template/backend/config/__init__.py +++ b/template/backend/config/__init__.py @@ -1,7 +1,7 @@ {% if copier__use_celery -%} # This will make sure the app is always imported when # Django starts so that shared_task will use this app. -from {{ copier__project_slug }}.celery import app as celery_app +from {{ copier__project_slug }}.celery_app import app as celery_app __all__ = ("celery_app",) {% endif -%} diff --git a/template/backend/{{copier__project_slug}}/celery.py b/template/backend/{{copier__project_slug}}/celery_app.py similarity index 100% rename from template/backend/{{copier__project_slug}}/celery.py rename to template/backend/{{copier__project_slug}}/celery_app.py diff --git a/template/k8s/base/celery.yaml b/template/k8s/base/celery.yaml index 016e44c..3d8ae9f 100644 --- a/template/k8s/base/celery.yaml +++ b/template/k8s/base/celery.yaml @@ -56,11 +56,11 @@ spec: containers: - name: celeryworker image: backend:latest - command: + command: - celery args: - -A - - {{ copier__project_slug }} + - {{ copier__project_slug }}.celery_app - worker - -E - -l @@ -72,11 +72,11 @@ spec: name: secrets-config - name: celerybeat image: backend:latest - command: + command: - celery args: - -A - - {{ copier__project_slug }} + - {{ copier__project_slug }}.celery_app - beat envFrom: - configMapRef: @@ -88,11 +88,11 @@ spec: - name: flower-server containerPort: 5555 image: backend:latest - command: + command: - celery args: - -A - - {{ copier__project_slug }} + - {{ copier__project_slug }}.celery_app - flower envFrom: - configMapRef: diff --git a/template/k8s/base/flower.yaml b/template/k8s/base/flower.yaml index f4589e5..d589688 100644 --- a/template/k8s/base/flower.yaml +++ b/template/k8s/base/flower.yaml @@ -18,7 +18,7 @@ spec: containers: - name: flower image: {{ copier__project_slug }}_local_django:latest - command: ["celery", "-A", "{{ copier__project_slug }}", "flower"] + command: ["celery", "-A", "{{ copier__project_slug }}.celery_app", "flower"] envFrom: - configMapRef: name: django-config @@ -26,7 +26,7 @@ spec: - name: celery-check-workers-ready image: {{ copier__project_slug }}_local_django:latest command: - ['sh', '-c', 'until celery -A {{ copier__project_slug }} inspect ping; do echo Waiting for Celery workers to be ready; sleep 5; done'] + ['sh', '-c', 'until celery -A {{ copier__project_slug }}.celery_app inspect ping; do echo Waiting for Celery workers to be ready; sleep 5; done'] envFrom: - configMapRef: name: django-config diff --git a/template/tasks.py b/template/tasks.py index 1389c7e..b45f6f3 100644 --- a/template/tasks.py +++ b/template/tasks.py @@ -40,7 +40,7 @@ def remove_celery_files(): file_names = [ - os.path.join("backend", "{{ copier__project_slug }}", "celery.py"), + os.path.join("backend", "{{ copier__project_slug }}", "celery_app.py"), os.path.join("backend", "{{ copier__project_slug }}", "users", "tasks.py"), os.path.join( "backend",