Skip to content
Snippets Groups Projects
Commit 13644654 authored by Hervé  MENAGER's avatar Hervé MENAGER
Browse files

use a instance-custom configurated celery queue

this avoids tasks being processed by celery queues launched for
other instances of iPPI-DB
parent 68e7af95
No related branches found
No related tags found
1 merge request!13Master
Pipeline #27722 failed
...@@ -9,11 +9,13 @@ Group=ippidb ...@@ -9,11 +9,13 @@ Group=ippidb
EnvironmentFile=-/etc/default/ippidb-{{ http_port }}-celeryd EnvironmentFile=-/etc/default/ippidb-{{ http_port }}-celeryd
WorkingDirectory=/home/ippidb/ippidb-web-{{ http_port }}/ippisite WorkingDirectory=/home/ippidb/ippidb-web-{{ http_port }}/ippisite
ExecStart=/bin/sh -c '${CELERY_BIN} multi start ${CELERYD_NODES} \ ExecStart=/bin/sh -c '${CELERY_BIN} multi start ${CELERYD_NODES} \
-Q ${CELERYD_QUEUE}
-A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} \ -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} \
--logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}' --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
ExecStop=/bin/sh -c '${CELERY_BIN} multi stopwait ${CELERYD_NODES} \ ExecStop=/bin/sh -c '${CELERY_BIN} multi stopwait ${CELERYD_NODES} \
--pidfile=${CELERYD_PID_FILE}' --pidfile=${CELERYD_PID_FILE}'
ExecReload=/bin/sh -c '${CELERY_BIN} multi restart ${CELERYD_NODES} \ ExecReload=/bin/sh -c '${CELERY_BIN} multi restart ${CELERYD_NODES} \
-Q ${CELERYD_QUEUE}
-A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} \ -A ${CELERY_APP} --pidfile=${CELERYD_PID_FILE} \
--logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}' --logfile=${CELERYD_LOG_FILE} --loglevel=${CELERYD_LOG_LEVEL} ${CELERYD_OPTS}'
......
...@@ -8,6 +8,7 @@ CELERYD_PID_FILE="/var/ippidb-{{ http_port }}-celery/celery%n.pid" ...@@ -8,6 +8,7 @@ CELERYD_PID_FILE="/var/ippidb-{{ http_port }}-celery/celery%n.pid"
CELERYD_LOG_LEVEL="DEBUG" CELERYD_LOG_LEVEL="DEBUG"
CELERYD_USER="celery-{{ http_port }}" CELERYD_USER="celery-{{ http_port }}"
CELERYD_GROUP="ippidb" CELERYD_GROUP="ippidb"
CELERYD_QUEUE="celery-{{ http_port }}"
CELERY_CREATE_DIRS=1 CELERY_CREATE_DIRS=1
SYSTEMD_LOG_LEVEL=debug SYSTEMD_LOG_LEVEL=debug
DJANGO_SETTINGS_MODULE=ippisite.{{ ansible_hostname }}_settings DJANGO_SETTINGS_MODULE=ippisite.{{ ansible_hostname }}_settings
......
...@@ -214,6 +214,12 @@ ...@@ -214,6 +214,12 @@
} }
} }
marker: "# {mark} ANSIBLE MANAGED DATABASE SETTINGS" marker: "# {mark} ANSIBLE MANAGED DATABASE SETTINGS"
- name: Configure the CELERY QUEUE to submit tasks to from Django
blockinfile:
path: "{{ checkout_path }}/ippisite/ippisite/{{ ansible_hostname }}_settings.py"
block: |
CELERY_TASK_DEFAULT_QUEUE = "celery-{{ http_port }}"
marker: "# {mark} ANSIBLE MANAGED CELERY DEFAULT TASK QUEUE"
- name: Add database settings to iPPI-DB settings - name: Add database settings to iPPI-DB settings
blockinfile: blockinfile:
path: "{{ checkout_path }}/ippisite/ippisite/{{ ansible_hostname }}_settings.py" path: "{{ checkout_path }}/ippisite/ippisite/{{ ansible_hostname }}_settings.py"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment