Adding a handler, var use improvements

playbooks/roles/xqwatcher/defaults/main.yml

@@ -102,9 +102,5 @@ xqwatcher_supervisor_available_dir: "{{ xqwatcher_supervisor_app_dir }}/conf.ava
 
 xqwatcher_debian_pkgs:
   - apparmor-utils
-  # for graders using numpy
-  - gfortran
-  - libatlas3gf-base
-  - liblapack-dev
 
 xqwatcher_redhat_pkgs: []
\ No newline at end of file

playbooks/roles/xqwatcher/handlers/main.yml

@@ -14,3 +14,10 @@
 # Overview:
 #
 #
+- name: restart xqwatcher
+  supervisorctl_local: >
+    state=restarted
+    supervisorctl_path={{ xqwatcher_supervisor_ctl }}
+    config={{ xqwatcher_supervisor_app_dir }}/supervisord.conf
+    name={{ xqwatcher_service_name }}
+  when: not disable_edx_services

playbooks/roles/xqwatcher/tasks/deploy_watcher.yml

@@ -37,5 +37,6 @@
   when: not disable_edx_services
 
 - name: update supervisor configuration
-  shell: "{{ xqwatcher_supervisor_ctl }} -c /edx/app/xqwatcher/supervisor/supervisord.conf update"
-  when: not disable_edx_services
\ No newline at end of file
+  shell: "{{ xqwatcher_supervisor_ctl }} -c {{ xqwatcher_supervisor_app_dir }}/supervisord.conf update"
+  when: not disable_edx_services
+  notify: restart xqwatcher
\ No newline at end of file

playbooks/roles/xqwatcher/templates/edx/app/supervisor/conf.d/xqwatcher.conf.j2

@@ -7,14 +7,13 @@
 {% set executable = xqwatcher_venv_dir + '/bin/python' %}
 {% endif %}
 
-[program:xqwatcher]
+[program:{{ xqwatcher_service_name }}]
 command={{ executable }} -m {{ xqwatcher_module }} -d {{ xqwatcher_conf_dir }} 
 process_name=%(program_name)s
 user={{ xqwatcher_user }}
 directory={{ xqwatcher_code_dir }}
 stdout_logfile={{ xqwatcher_supervisor_log_dir }}/%(program_name)-stdout.log
 stderr_logfile={{ xqwatcher_supervisor_log_dir }}/%(program_name)-stderr.log
-environment={% if COMMON_ENABLE_NEWRELIC %}NEW_RELIC_APP_NAME={{ XQWATCHER_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ COMMON_NEWRELIC_LICENSE }}{% endif %}
-
+environment={% if COMMON_ENABLE_NEWRELIC %}NEW_RELIC_APP_NAME={{ XQWATCHER_NEWRELIC_APPNAME }},NEW_RELIC_LICENSE_KEY={{ COMMON_NEWRELIC_LICENSE }},{% endif -%}
 killasgroup=true
 stopasgroup=true