accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2024-11-12 00:06:36 +00:00
Code Issues Releases Activity

fix: add logging and set user if not passed

Browse Source
This commit is contained in:
Gavin D'souza 2020-06-10 19:25:35 +05:30
parent 629842a042
commit fc4b90acdb
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bench/config/supervisor.py
View File

@ -70,6 +70,9 @@ def update_supervisord_config(user=None, yes=False):
"""From bench v5.x, we're moving to supervisor running as user""" """From bench v5.x, we're moving to supervisor running as user"""
from bench.config.production_setup import service from bench.config.production_setup import service
if not user:
user = getpass.getuser()
supervisord_conf = get_supervisord_conf() supervisord_conf = get_supervisord_conf()
section = "unix_http_server" section = "unix_http_server"
updated_values = { updated_values = {
@ -79,6 +82,7 @@ def update_supervisord_config(user=None, yes=False):
supervisord_conf_changes = "" supervisord_conf_changes = ""
if not supervisord_conf: if not supervisord_conf:
logger.log("supervisord.conf not found")
return return
config = configparser.ConfigParser() config = configparser.ConfigParser()
@ -94,11 +98,12 @@ def update_supervisord_config(user=None, yes=False):
current_value = config[section].get(key, "") current_value = config[section].get(key, "")
if current_value.strip() != value: if current_value.strip() != value:
config.set(section, key, value) config.set(section, key, value)
action = "Updated supervisord config: '{0}' changed from '{1}' to '{2}'".format(key, current_value, value) action = "Updated supervisord.conf: '{0}' changed from '{1}' to '{2}'".format(key, current_value, value)
logger.log(action) logger.log(action)
supervisord_conf_changes += '\n' + action supervisord_conf_changes += '\n' + action
if not supervisord_conf_changes: if not supervisord_conf_changes:
logger.log("supervisord.conf not updated")
return return
if not yes: if not yes:
@ -107,9 +112,9 @@ def update_supervisord_config(user=None, yes=False):
try: try:
with open(supervisord_conf, "w") as f: with open(supervisord_conf, "w") as f:
config.write(f) config.write(f)
logger.log("Updated supervisord config at '{0}'".format(supervisord_conf)) logger.log("Updated supervisord.conf at '{0}'".format(supervisord_conf))
except Exception as e: except Exception as e:
logger.log("Updating supervisord config failed due to '{0}'".format(e)) logger.log("Updating supervisord.conf failed due to '{0}'".format(e))
# Reread supervisor configuration, reload supervisord and supervisorctl, restart services that were started # Reread supervisor configuration, reload supervisord and supervisorctl, restart services that were started
service('supervisor', 'reload') service('supervisor', 'reload')