Skip to content

Commit

Permalink
Merge pull request #1507 from akhilnarang/optimize-restart
Browse files Browse the repository at this point in the history
feat(supervisor): restart each group separately
  • Loading branch information
ankush authored Jan 10, 2024
2 parents a834d86 + 839bd7c commit 0056cdf
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions bench/utils/bench.py
Original file line number Diff line number Diff line change
Expand Up @@ -310,22 +310,23 @@ def restart_supervisor_processes(bench_path=".", web_workers=False, _raise=False
supervisor_status = get_cmd_output("sudo supervisorctl status", cwd=bench_path)

if web_workers and f"{bench_name}-web:" in supervisor_status:
group = f"{bench_name}-web:\t"
groups = [f"{bench_name}-web:\t"]

elif f"{bench_name}-workers:" in supervisor_status:
group = f"{bench_name}-workers: {bench_name}-web:"
groups = [f"{bench_name}-web:", f"{bench_name}-workers:"]

# backward compatibility
elif f"{bench_name}-processes:" in supervisor_status:
group = f"{bench_name}-processes:"
groups = [f"{bench_name}-processes:"]

# backward compatibility
else:
group = "frappe:"
groups = ["frappe:"]

failure = bench.run(f"{sudo}supervisorctl restart {group}", _raise=_raise)
if failure:
log("restarting supervisor failed. Use `bench restart` to retry.", level=3)
for group in groups:
failure = bench.run(f"{sudo}supervisorctl restart {group}", _raise=_raise)
if failure:
log(f"restarting supervisor group `{group}` failed. Use `bench restart` to retry.", level=3)


def restart_systemd_processes(bench_path=".", web_workers=False, _raise=True):
Expand Down

0 comments on commit 0056cdf

Please sign in to comment.