diff --git a/allianceauth/project_template/supervisor.conf b/allianceauth/project_template/supervisor.conf index 5dcc54d6..3c74a372 100644 --- a/allianceauth/project_template/supervisor.conf +++ b/allianceauth/project_template/supervisor.conf @@ -1,49 +1,48 @@ [program:beat] -command={{ celery }} -A {{ project_name }} beat -directory={{ project_directory }} -user=allianceserver -stdout_logfile={{ project_directory }}/log/beat.log -stderr_logfile={{ project_directory }}/log/beat.log -autostart=true -autorestart=true -startsecs=10 -priority=998 +command = {{ celery }} -A {{ project_name }} beat +directory = {{ project_directory }} +user = allianceserver +stdout_logfile = {{ project_directory }}/log/%(program_name)s.log +stderr_logfile = {{ project_directory }}/log/%(program_name)s.log +autostart = true +autorestart = true +startsecs = 10 +priority = 998 [program:worker] -command={{ celery }} -A {{ project_name }} worker --pool=threads --concurrency=5 -n %(program_name)s_%(process_num)02d -directory={{ project_directory }} -user=allianceserver -numprocs=1 -process_name=%(program_name)s_%(process_num)02d -stdout_logfile={{ project_directory }}/log/worker.log -stderr_logfile={{ project_directory }}/log/worker.log -autostart=true -autorestart=true -startsecs=10 +command = {{ celery }} -A {{ project_name }} worker --pool=threads --concurrency=5 -n %(program_name)s_%(process_num)02d +directory = {{ project_directory }} +user = allianceserver +numprocs = 1 +process_name = %(program_name)s_%(process_num)02d +stdout_logfile = {{ project_directory }}/log/%(program_name)s.log +stderr_logfile = {{ project_directory }}/log/%(program_name)s.log +autostart = true +autorestart = true +startsecs = 10 stopwaitsecs = 600 -killasgroup=true -priority=998 +killasgroup = true +priority = 998 {% if gunicorn %} [program:gunicorn] user = allianceserver -directory={{ project_directory }} -command={{ gunicorn }} {{ project_name }}.wsgi --workers=3 --timeout 120 -stdout_logfile={{ project_directory }}/log/gunicorn.log -stderr_logfile={{ project_directory }}/log/gunicorn.log -autostart=true -autorestart=true -stopsignal=INT - +directory = {{ project_directory }} +command = {{ gunicorn }} {{ project_name }}.wsgi --workers=3 --timeout 120 +stdout_logfile = {{ project_directory }}/log/%(program_name)s.log +stderr_logfile = {{ project_directory }}/log/%(program_name)s.log +autostart = true +autorestart = true +stopsignal = INT {% endif %} [eventlistener:memmon] -command={{ memmon }} -p worker_00=256MB -p gunicorn=256MB -directory={{ project_directory }} -events=TICK_60 -stdout_logfile={{ project_directory }}/log/memmon.log -stderr_logfile={{ project_directory }}/log/memmon.log +command = {{ memmon }} -p worker_00=256MB -p gunicorn=256MB +directory = {{ project_directory }} +events = TICK_60 +stdout_logfile = {{ project_directory }}/log/memmon.log +stderr_logfile = {{ project_directory }}/log/memmon.log [group:{{ project_name }}] -programs=beat,worker{% if gunicorn %},gunicorn{% endif %} -priority=999 +programs = beat,worker{% if gunicorn %},gunicorn{% endif %} +priority = 999