Skip to content

Commit 0828148

Browse files
Adjust supervisord service logic, minor improvements
1 parent 92c8c4c commit 0828148

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

tasks/config-FreeBSD.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
- name: Template the roadrunner config
3-
register: roadrunner_template_config_result
2+
- name: Template the roadrunner config ({{ roadrunner_config.key }})
3+
register: roadrunner_template_config_result
44
loop_control:
55
label: "{{ roadrunner_config.key }}"
66
ansible.builtin.template:
@@ -22,12 +22,12 @@
2222
owner: root
2323
mode: "0644"
2424

25-
- name: Enable and start the roadrunner-{{ roadrunner_config.key }} service
26-
when: roadrunner_php_script_exists.stat.exists
25+
- name: Enable and start the roadrunner-{{ roadrunner_config.key }} service if PHP script exists
2726
register: roadrunner_service_supervisord_started
2827
community.general.supervisorctl:
2928
name: "roadrunner-{{ roadrunner_config.key }}"
30-
state: present
29+
state: "{{ 'present' if roadrunner_php_script_exists.stat.exists else 'absent' }}"
30+
stop_before_removing: yes
3131

3232
- name: Restart the roadrunner-{{ roadrunner_config.key }} service
3333
when: roadrunner_php_script_exists.stat.exists and not roadrunner_service_supervisord_started.changed and (roadrunner_template_service_config_result.changed or roadrunner_template_config_result.changed or (roadrunner_version is defined and roadrunner_version.stdout != roadrunner.version))

templates/supervisord.d/roadrunner.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
user=proserver
33
environment=PATH={{ roadrunner.prefix.bin}}:/usr/local/bin:%(ENV_PATH)s
44
command={{ roadrunner.prefix.bin }}/rr -w {{ roadrunner_config.value.working_directory | default(roadrunner.prefix.current_release) }} -c {{ roadrunner.prefix.config }}/{{ roadrunner_config.key }}/rr.yaml -d serve -p
5-
autostart={{ 'true' if roadrunner_php_script_exists.stat.exists else 'false' }}
5+
autostart=true
66
autorestart=true
77
stopsignal=QUIT
88
stderr_logfile=/var/log/roadrunner/{{ roadrunner_config.key }}.err.log

0 commit comments

Comments
 (0)