accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-01-08 00:04:38 +00:00
Code Issues Releases Activity

Merge pull request #1354 from gavindsouza/skip-supervisord

Browse Source 
fix: Suggest don't update supervisord conf
This commit is contained in:
gavin 2022-08-04 14:06:13 +05:30 committed by GitHub
commit 391dcf1e12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
bench/commands/setup.py
View File

@ -49,17 +49,25 @@ def reload_nginx():
@click.option(
"--skip-redis", help="Skip redis configuration", is_flag=True, default=False
)
def setup_supervisor(user=None, yes=False, skip_redis=False):
@click.option(
"--skip-supervisord",
help="Skip supervisord configuration",
is_flag=True,
default=False,
)
def setup_supervisor(user=None, yes=False, skip_redis=False, skip_supervisord=False):
from bench.utils import get_cmd_output
from bench.config.supervisor import (
update_supervisord_config,
check_supervisord_config,
generate_supervisor_config,
)
which("supervisorctl", raise_err=True)
if "Permission denied" in get_cmd_output("supervisorctl status"):
update_supervisord_config(user=user, yes=yes)
if not skip_supervisord and "Permission denied" in get_cmd_output(
"supervisorctl status"
):
check_supervisord_config(user=user)
generate_supervisor_config(bench_path=".", user=user, yes=yes, skip_redis=skip_redis)

4
bench/config/production_setup.py
View File

@ -9,7 +9,7 @@ import bench
from bench.config.nginx import make_nginx_conf
from bench.config.supervisor import (
generate_supervisor_config,
update_supervisord_config,
check_supervisord_config,
)
from bench.config.systemd import generate_systemd_config
from bench.bench import Bench
@ -48,7 +48,7 @@ def setup_production(user, bench_path=".", yes=False):
generate_systemd_config(bench_path=bench_path, user=user, yes=yes)
else:
print("Setting Up supervisor...")
update_supervisord_config(user=user, yes=yes)
check_supervisord_config(user=user)
generate_supervisor_config(bench_path=bench_path, user=user, yes=yes)
print("Setting Up NGINX...")

22
bench/config/supervisor.py
View File

@ -79,10 +79,11 @@ def get_supervisord_conf():
return possibility
def update_supervisord_config(user=None, yes=False):
def check_supervisord_config(user=None):
"""From bench v5.x, we're moving to supervisor running as user"""
# i don't think bench should be responsible for this but we're way past this now...
# removed updating supervisord conf & reload in Aug 2022 - gavin@frappe.io
import configparser
from bench.config.production_setup import service
if not user:
user = getpass.getuser()
@ -125,20 +126,3 @@ def update_supervisord_config(user=None, yes=False):
print(
f"Update your {supervisord_conf} with the following values:\n[{section}]\n{contents}"
)
return
if not yes:
click.confirm(
f"{supervisord_conf} will be updated with the following values:\n{supervisord_conf_changes}\nDo you want to continue?",
abort=True,
)
try:
with open(supervisord_conf, "w") as f:
config.write(f)
logger.log(f"Updated supervisord.conf at '{supervisord_conf}'")
except Exception as e:
logger.log(f"Updating supervisord.conf failed due to '{e}'")
# Reread supervisor configuration, reload supervisord and supervisorctl, restart services that were started
service("supervisor", "reload")