Convert edxapp gunicorn to configuration file

playbooks/roles/edxapp/defaults/main.yml

@@ -28,7 +28,10 @@ EDXAPP_PREVIEW_LMS_BASE: ""
 EDXAPP_CMS_BASE: ""
 
 EDXAPP_LMS_GUNICORN_EXTRA: ""
+EDXAPP_LMS_GUNICORN_EXTRA_CONF: ""
+
 EDXAPP_CMS_GUNICORN_EXTRA: ""
+EDXAPP_CMS_GUNICORN_EXTRA_CONF: ""
 
 # Set this to the maximum number
 # of requests for gunicorn for the lms and cms

playbooks/roles/edxapp/tasks/service_variant_config.yml

@@ -37,6 +37,14 @@
     group={{ supervisor_user }}
   sudo_user: "{{ supervisor_user }}"
 
+- name: "add gunicorn configuration files"
+  template: >
+    src={{ item }}_gunicorn.py.j2 dest={{ edxapp_app_dir }}/{{ item }}_gunicorn.py
+  with_items: service_variants_enabled
+  sudo_user: "{{ edxapp_user }}"
+  notify:
+    - restart edxapp
+
 # write the supervisor script for celery workers
 
 - name: writing celery worker supervisor script

playbooks/roles/edxapp/templates/cms.conf.j2

@@ -5,22 +5,8 @@
 {% else -%}
 {% set executable = edxapp_venv_dir + '/bin/gunicorn' -%}
 {% endif -%}
-{% if EDXAPP_CMS_MAX_REQ -%}
-{% set max_req = '--max-requests ' + EDXAPP_CMS_MAX_REQ|string -%}
-{% else -%}
-{% set max_req = '' -%}
-{% endif -%}
 
-{% if EDXAPP_WORKERS -%}
-command={{ executable }} {{ max_req }} --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ EDXAPP_WORKERS.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} cms.wsgi
-{% else -%}
-{# This is for backwards compatibility, set workers explicitely using EDXAPP_WORKERS #}
-{% if ansible_processor|length > 0 -%}
-command={{ executable }} {{ max_req }} --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ ansible_processor|length * worker_core_mult.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} {{ EDXAPP_CMS_GUNICORN_EXTRA }} cms.wsgi
-{% else -%}
-command={{ executable }} {{ max_req }} --preload -b {{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }} -w {{ worker_core_mult.cms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} {{ EDXAPP_CMS_GUNICORN_EXTRA }} cms.wsgi
-{% endif -%}
-{% endif -%}
+command={{ executable }} -c {{ edxapp_app_dir }}/cms_gunicorn.py {{ EDXAPP_CMS_GUNICORN_EXTRA }} cms.wsgi
 
 user={{ common_web_user }}
 directory={{ edxapp_code_dir }}

playbooks/roles/edxapp/templates/cms_gunicorn.py.j2

+"""
+gunicorn configuration file: http://docs.gunicorn.org/en/develop/configure.html
+
+{{ ansible_managed }}
+"""
+import multiprocessing
+
+preload_app = True
+timeout = 300
+bind = "{{ edxapp_cms_gunicorn_host }}:{{ edxapp_cms_gunicorn_port }}"
+pythonpath = "{{ edxapp_code_dir }}"
+
+{% if EDXAPP_CMS_MAX_REQ -%}
+max_requests = {{ EDXAPP_CMS_MAX_REQ }}
+{% endif -%}
+
+{% if EDXAPP_WORKERS %}
+workers = {{ EDXAPP_WORKERS }}
+{% else %}
+workers = (multiprocessing.cpu_count()-1) * {{ worker_core_mult.cms }} + {{ worker_core_mult.cms }}
+{% endif %}
+
+
+{{ EDXAPP_CMS_GUNICORN_EXTRA_CONF }}

playbooks/roles/edxapp/templates/lms.conf.j2

@@ -6,22 +6,7 @@
 {% set executable = edxapp_venv_dir + '/bin/gunicorn' -%}
 {% endif -%}
 
-{% if EDXAPP_LMS_MAX_REQ -%}
-{% set max_req = '--max-requests ' + EDXAPP_LMS_MAX_REQ|string -%}
-{% else -%}
-{% set max_req = '' -%}
-{% endif -%}
-
-{% if EDXAPP_WORKERS -%}
-command={{ executable }} {{ max_req }} --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ EDXAPP_WORKERS.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} lms.wsgi
-{% else -%}
-{# This is for backwards compatibility, set workers explicitely using EDXAPP_WORKERS #}
-{% if ansible_processor|length > 0 -%}
-command={{ executable }} {{ max_req }} --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ ansible_processor|length * worker_core_mult.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} {{ EDXAPP_LMS_GUNICORN_EXTRA }} lms.wsgi
-{% else -%}
-command={{ executable }} {{ max_req }} --preload -b {{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }} -w {{ worker_core_mult.lms }} --timeout=300 --pythonpath={{ edxapp_code_dir }} {{ EDXAPP_LMS_GUNICORN_EXTRA }} lms.wsgi
-{% endif %}
-{% endif %}
+command={{ executable }} -c {{ edxapp_app_dir }}/lms_gunicorn.py lms.wsgi
 
 user={{ common_web_user }}
 directory={{ edxapp_code_dir }}

playbooks/roles/edxapp/templates/lms_gunicorn.py.j2

+"""
+gunicorn configuration file: http://docs.gunicorn.org/en/develop/configure.html
+
+{{ ansible_managed }}
+"""
+import multiprocessing
+
+preload_app = True
+timeout = 300
+bind = "{{ edxapp_lms_gunicorn_host }}:{{ edxapp_lms_gunicorn_port }}"
+pythonpath = "{{ edxapp_code_dir }}"
+
+{% if EDXAPP_LMS_MAX_REQ -%}
+max_requests = {{ EDXAPP_LMS_MAX_REQ }}
+{% endif -%}
+
+{% if EDXAPP_WORKERS %}
+workers = {{ EDXAPP_WORKERS }}
+{% else %}
+workers = (multiprocessing.cpu_count()-1) * {{ worker_core_mult.lms }} + {{ worker_core_mult.lms }}
+{% endif %}
+
+
+{{ EDXAPP_LMS_GUNICORN_EXTRA_CONF }}