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

Merge pull request #620 from achillesrasquinha/fix-encodings

Browse Source 
fixed encodings
This commit is contained in:
Achilles Rasquinha 2018-03-28 19:58:16 +05:30 committed by GitHub
commit 8dd4dbe38c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bench/utils.py
View File

@ -306,9 +306,10 @@ def setup_sudoers(user):
'nginx': find_executable('nginx'), 'nginx': find_executable('nginx'),
'bench': find_executable('bench') 'bench': find_executable('bench')
}) })
frappe_sudoers = safe_decode(frappe_sudoers)
with open(sudoers_file, 'w') as f: with open(sudoers_file, 'w') as f:
f.write(frappe_sudoers.encode('utf-8')) f.write(frappe_sudoers)
os.chmod(sudoers_file, 0o440) os.chmod(sudoers_file, 0o440)
@ -388,6 +389,14 @@ def get_cmd_output(cmd, cwd='.'):
print(e.output) print(e.output)
raise raise
def safe_encode(what, encoding = 'utf-8'):
try:
what = what.encode(encoding)
except Exception:
pass
return what
def restart_supervisor_processes(bench_path='.', web_workers=False): def restart_supervisor_processes(bench_path='.', web_workers=False):
from .config.common_site_config import get_config from .config.common_site_config import get_config
conf = get_config(bench_path=bench_path) conf = get_config(bench_path=bench_path)
@ -399,6 +408,7 @@ def restart_supervisor_processes(bench_path='.', web_workers=False):
else: else:
supervisor_status = subprocess.check_output(['sudo', 'supervisorctl', 'status'], cwd=bench_path) supervisor_status = subprocess.check_output(['sudo', 'supervisorctl', 'status'], cwd=bench_path)
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:
group = '{bench_name}-web: '.format(bench_name=bench_name) group = '{bench_name}-web: '.format(bench_name=bench_name)