accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-02-10 22:58:30 +00:00
Code Issues Releases Activity

Merge pull request #1520 from akhilnarang/supervisor-startretries

Browse Source 
feat: set startretries in supervisor configuration
This commit is contained in:
Akhil Narang 2024-01-15 16:34:51 +05:30 committed by GitHub
commit 20ccfdff8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bench/commands/install.py
View File

@ -77,7 +77,7 @@ def install_nginx(user=None):
setup_sudoers(user) setup_sudoers(user)
@click.command("virtualbox", help="Installs supervisor") @click.command("virtualbox", help="Installs virtualbox")
def install_virtualbox(): def install_virtualbox():
run_playbook("vm_build.yml", tag="virtualbox") run_playbook("vm_build.yml", tag="virtualbox")

4
bench/commands/setup.py
View File

@ -73,7 +73,9 @@ def setup_supervisor(user=None, yes=False, skip_redis=False, skip_supervisord=Fa
generate_supervisor_config, generate_supervisor_config,
) )
which("supervisorctl", raise_err=True) if which("supervisorctl") is None:
click.secho("Please install `supervisor` to proceed", fg="red")
sys.exit(1)
if not skip_supervisord and "Permission denied" in get_cmd_output( if not skip_supervisord and "Permission denied" in get_cmd_output(
"supervisorctl status" "supervisorctl status"

1
bench/config/supervisor.py
View File

@ -59,6 +59,7 @@ def generate_supervisor_config(bench_path, user=None, yes=False, skip_redis=Fals
"skip_redis": skip_redis, "skip_redis": skip_redis,
"workers": config.get("workers", {}), "workers": config.get("workers", {}),
"multi_queue_consumption": can_enable_multi_queue_consumption(bench_path), "multi_queue_consumption": can_enable_multi_queue_consumption(bench_path),
"supervisor_startretries": 10,
} }
) )

9
bench/config/templates/supervisor.conf
View File

@ -14,6 +14,7 @@ stopwaitsecs=40
killasgroup=true killasgroup=true
user={{ user }} user={{ user }}
directory={{ sites_dir }} directory={{ sites_dir }}
startretries={{ supervisor_startretries }}
[program:{{ bench_name }}-frappe-schedule] [program:{{ bench_name }}-frappe-schedule]
command={{ bench_cmd }} schedule command={{ bench_cmd }} schedule
@ -24,6 +25,7 @@ stdout_logfile={{ bench_dir }}/logs/schedule.log
stderr_logfile={{ bench_dir }}/logs/schedule.error.log stderr_logfile={{ bench_dir }}/logs/schedule.error.log
user={{ user }} user={{ user }}
directory={{ bench_dir }} directory={{ bench_dir }}
startretries={{ supervisor_startretries }}
{% if not multi_queue_consumption %} {% if not multi_queue_consumption %}
[program:{{ bench_name }}-frappe-default-worker] [program:{{ bench_name }}-frappe-default-worker]
@ -39,6 +41,7 @@ directory={{ bench_dir }}
killasgroup=true killasgroup=true
numprocs={{ background_workers }} numprocs={{ background_workers }}
process_name=%(program_name)s-%(process_num)d process_name=%(program_name)s-%(process_num)d
startretries={{ supervisor_startretries }}
{% endif %} {% endif %}
[program:{{ bench_name }}-frappe-short-worker] [program:{{ bench_name }}-frappe-short-worker]
@ -54,6 +57,7 @@ directory={{ bench_dir }}
killasgroup=true killasgroup=true
numprocs={{ background_workers }} numprocs={{ background_workers }}
process_name=%(program_name)s-%(process_num)d process_name=%(program_name)s-%(process_num)d
startretries={{ supervisor_startretries }}
[program:{{ bench_name }}-frappe-long-worker] [program:{{ bench_name }}-frappe-long-worker]
command={{ bench_cmd }} worker --queue long{{',default,short' if multi_queue_consumption else ''}} command={{ bench_cmd }} worker --queue long{{',default,short' if multi_queue_consumption else ''}}
@ -68,6 +72,7 @@ directory={{ bench_dir }}
killasgroup=true killasgroup=true
numprocs={{ background_workers }} numprocs={{ background_workers }}
process_name=%(program_name)s-%(process_num)d process_name=%(program_name)s-%(process_num)d
startretries={{ supervisor_startretries }}
{% for worker_name, worker_details in workers.items() %} {% for worker_name, worker_details in workers.items() %}
[program:{{ bench_name }}-frappe-{{ worker_name }}-worker] [program:{{ bench_name }}-frappe-{{ worker_name }}-worker]
@ -83,6 +88,7 @@ directory={{ bench_dir }}
killasgroup=true killasgroup=true
numprocs={{ worker_details["background_workers"] or background_workers }} numprocs={{ worker_details["background_workers"] or background_workers }}
process_name=%(program_name)s-%(process_num)d process_name=%(program_name)s-%(process_num)d
startretries={{ supervisor_startretries }}
{% endfor %} {% endfor %}
@ -96,6 +102,7 @@ stdout_logfile={{ bench_dir }}/logs/redis-cache.log
stderr_logfile={{ bench_dir }}/logs/redis-cache.error.log stderr_logfile={{ bench_dir }}/logs/redis-cache.error.log
user={{ user }} user={{ user }}
directory={{ sites_dir }} directory={{ sites_dir }}
startretries={{ supervisor_startretries }}
[program:{{ bench_name }}-redis-queue] [program:{{ bench_name }}-redis-queue]
command={{ redis_server }} {{ redis_queue_config }} command={{ redis_server }} {{ redis_queue_config }}
@ -106,6 +113,7 @@ stdout_logfile={{ bench_dir }}/logs/redis-queue.log
stderr_logfile={{ bench_dir }}/logs/redis-queue.error.log stderr_logfile={{ bench_dir }}/logs/redis-queue.error.log
user={{ user }} user={{ user }}
directory={{ sites_dir }} directory={{ sites_dir }}
startretries={{ supervisor_startretries }}
{% endif %} {% endif %}
{% if node %} {% if node %}
@ -118,6 +126,7 @@ stdout_logfile={{ bench_dir }}/logs/node-socketio.log
stderr_logfile={{ bench_dir }}/logs/node-socketio.error.log stderr_logfile={{ bench_dir }}/logs/node-socketio.error.log
user={{ user }} user={{ user }}
directory={{ bench_dir }} directory={{ bench_dir }}
startretries={{ supervisor_startretries }}
{% endif %} {% endif %}
[group:{{ bench_name }}-web] [group:{{ bench_name }}-web]