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

fix: Show traceback in dev mode and set exit code on errors

Browse Source
This commit is contained in:
Gavin D'souza 2021-11-13 14:26:37 +05:30
parent 6123cd5b49
commit e074a1d886
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bench/cli.py
View File

@ -4,6 +4,7 @@ import json
import os import os
import pwd import pwd
import sys import sys
from traceback import format_exception
# imports - third party imports # imports - third party imports
import click import click
@ -34,7 +35,7 @@ src = os.path.dirname(__file__)
def cli(): def cli():
global from_command_line global from_command_line, bench_config
from_command_line = True from_command_line = True
command = " ".join(sys.argv) command = " ".join(sys.argv)
is_envvar_warn_set = not (os.environ.get("BENCH_DEVELOPER") or os.environ.get("CI")) is_envvar_warn_set = not (os.environ.get("BENCH_DEVELOPER") or os.environ.get("CI"))
@ -43,6 +44,8 @@ def cli():
logger = setup_logging() logger = setup_logging()
logger.info(command) logger.info(command)
bench_config = get_config(".")
if len(sys.argv) > 1 and sys.argv[1] not in ("src",): if len(sys.argv) > 1 and sys.argv[1] not in ("src",):
check_uid() check_uid()
change_uid() change_uid()
@ -52,7 +55,7 @@ def cli():
is_dist_editable(bench.PROJECT_NAME) is_dist_editable(bench.PROJECT_NAME)
and len(sys.argv) > 1 and len(sys.argv) > 1
and sys.argv[1] != "src" and sys.argv[1] != "src"
and not get_config(".").get("developer_mode") and not bench_config.get("developer_mode")
): ):
log( log(
"bench is installed in editable mode!\n\nThis is not the recommended mode" "bench is installed in editable mode!\n\nThis is not the recommended mode"
@ -98,8 +101,12 @@ def cli():
return_code = getattr(e, "code", 0) return_code = getattr(e, "code", 0)
if return_code: if return_code:
logger.warning(f"{command} executed with exit code {return_code}") logger.warning(f"{command} executed with exit code {return_code}")
if isinstance(e, Exception): if isinstance(e, Exception):
if os.environ.get("BENCH_DEVELOPER") or bench_config.get("developer_mode"):
click.secho("".join(format_exception(*sys.exc_info()))[:-1])
click.secho(f"ERROR: {e}", fg="red") click.secho(f"ERROR: {e}", fg="red")
return_code = 1
raise e raise e
finally: finally:
try: try:
@ -152,7 +159,7 @@ def change_dir():
def change_uid(): def change_uid():
if is_root() and not cmd_requires_root(): if is_root() and not cmd_requires_root():
frappe_user = get_config(".").get("frappe_user") frappe_user = bench_config.get("frappe_user")
if frappe_user: if frappe_user:
drop_privileges(uid_name=frappe_user, gid_name=frappe_user) drop_privileges(uid_name=frappe_user, gid_name=frappe_user)
os.environ["HOME"] = pwd.getpwnam(frappe_user).pw_dir os.environ["HOME"] = pwd.getpwnam(frappe_user).pw_dir