accounting/bench
2
0
Fork 0
mirror of https://github.com/frappe/bench.git synced 2025-01-25 07:58:24 +00:00
Code Issues Releases Activity

fix: get_cmd_output handles exit codes if no output

Browse Source 
eg: running "supervisorctl status" returns non zero codes in case
certain processes its running are in failed state. get_cmd_output will
now handle such situations

chore: dropped bench.utils.get_program
This commit is contained in:
Gavin D'souza 2020-03-13 17:57:43 +05:30
parent 51b81c3997
commit a03252881a
1 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bench/utils.py
View File

@ -450,17 +450,11 @@ def setup_logging(bench_path='.'):
logger.setLevel(logging.DEBUG) logger.setLevel(logging.DEBUG)
def get_program(programs):
program = None
for p in programs:
program = find_executable(p)
if program:
break
return program
def get_process_manager(): def get_process_manager():
return get_program(['foreman', 'forego', 'honcho']) for proc_man in ['honcho', 'foreman', 'forego']:
proc_man_path = find_executable(proc_man)
if proc_man_path:
return proc_man_path
def start(no_dev=False, concurrency=None, procfile=None): def start(no_dev=False, concurrency=None, procfile=None):
@ -516,14 +510,15 @@ def check_git_for_shallow_clone():
def get_cmd_output(cmd, cwd='.'): def get_cmd_output(cmd, cwd='.'):
print("{0}$ {1}{2}".format(color.silver, cmd, color.nc))
try: try:
output = subprocess.check_output(cmd, cwd=cwd, shell=True, stderr=subprocess.PIPE).strip() output = subprocess.check_output(cmd, cwd=cwd, shell=True, stderr=subprocess.PIPE).strip()
output = output.decode('utf-8')
return output
except subprocess.CalledProcessError as e: except subprocess.CalledProcessError as e:
if e.output: if e.output:
print(e.output) output = e.output
raise else:
raise
return safe_decode(output)
def safe_encode(what, encoding = 'utf-8'): def safe_encode(what, encoding = 'utf-8'):
@ -545,7 +540,7 @@ def restart_supervisor_processes(bench_path='.', web_workers=False):
exec_cmd(cmd, cwd=bench_path) exec_cmd(cmd, cwd=bench_path)
else: else:
supervisor_status = subprocess.check_output(['supervisorctl', 'status'], cwd=bench_path) supervisor_status = get_cmd_output('supervisorctl status', cwd=bench_path)
supervisor_status = safe_decode(supervisor_status) supervisor_status = safe_decode(supervisor_status)
if web_workers and '{bench_name}-web:'.format(bench_name=bench_name) in supervisor_status: if web_workers and '{bench_name}-web:'.format(bench_name=bench_name) in supervisor_status: