Convert xqueue gunicorn configuration to file

playbooks/roles/xqueue/defaults/main.yml

@@ -3,7 +3,7 @@
 ---
 XQUEUE_NGINX_PORT: 18040
 XQUEUE_GUNICORN_WORKERS_EXTRA: ""
-XQUEUE_GUNICORN_EXTRA: ""
+XQUEUE_GUNICORN_WORKERS_EXTRA_CONF: ""
 XQUEUE_QUEUES:
   # push queue
   'edX-Open_DemoX': 'http://localhost:18050'

playbooks/roles/xqueue/tasks/deploy.yml

@@ -13,6 +13,12 @@
   with_items: ['xqueue', 'xqueue_consumer']
   when: not disable_edx_services
 
+- name: "add gunicorn configuration file"
+  template: >
+    src=xqueue_gunicorn.py.j2 dest={{ xqueue_app_dir }}/xqueue_gunicorn.py
+  sudo_user: "{{ xqueue_user }}"
+  notify:
+    - restart xqueue
 
 - name: create xqueue application config
   template: src=xqueue.env.json.j2 dest={{ xqueue_app_dir }}/xqueue.env.json mode=0644

playbooks/roles/xqueue/templates/xqueue.conf.j2

@@ -6,15 +6,7 @@
 {% set executable = xqueue_venv_bin + '/gunicorn' %}
 {% endif %}
 
-{% if XQUEUE_WORKERS -%}
-command={{ executable }} --preload -b {{ xqueue_gunicorn_host }}:{{ xqueue_gunicorn_port }} -w {{ XQUEUE_WORKERS }} --timeout=300 --pythonpath={{ xqueue_code_dir }} {{ XQUEUE_GUNICORN_WORKERS_EXTRA }} xqueue.wsgi
-{% else -%}
-{% if ansible_processor|length > 0 %}
-command={{ executable }} --preload -b {{ xqueue_gunicorn_host }}:{{ xqueue_gunicorn_port }} -w {{ ansible_processor|length * 2 }} --timeout=300 --pythonpath={{ xqueue_code_dir }} {{ XQUEUE_GUNICORN_EXTRA }} xqueue.wsgi
-{% else -%}
-command={{ executable }} --preload -b {{ xqueue_gunicorn_host }}:{{ xqueue_gunicorn_port }} -w 2 --timeout=300 --pythonpath={{ xqueue_code_dir }} {{ XQUEUE_GUNICORN_EXTRA }} xqueue.wsgi
-{% endif -%}
-{% endif -%}
+command={{ executable }} -c {{ xqueue_app_dir }}/xqueue_gunicorn.py {{ XQUEUE_GUNICORN_WORKERS_EXTRA }} xqueue.wsgi
 
 user={{ common_web_user }}
 directory={{ xqueue_code_dir }}

playbooks/roles/xqueue/templates/xqueue_gunicorn.py.j2

+"""
+gunicorn configuration file: http://docs.gunicorn.org/en/develop/configure.html
+
+{{ ansible_managed }}
+"""
+import multiprocessing
+
+preload_app = True
+timeout = 300
+bind = "{{ xqueue_gunicorn_host }}:{{ xqueue_gunicorn_port }}"
+pythonpath = "{{ xqueue_code_dir }}"
+
+{% if XQUEUE_WORKERS %}
+workers = {{ XQUEUE_WORKERS }}
+{% else %}
+workers = (multiprocessing.cpu_count()-1) * 2 + 2
+{% endif %}
+
+{{ XQUEUE_GUNICORN_WORKERS_EXTRA_CONF }}