mirror of
ssh://git.janware.com/janware/proj/jw-pkg
synced 2026-04-25 17:45:55 +02:00
jw.pkg.lib: Don't log {e}
Don't log an Exception as {e} but as str(e) producing nicer output.
Or as repr(e) if a backtrace is requested, because to people who can
read backtraces, type info might be of interest. Also, remove
pointless time stamps, those belong into the logging framework.
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
parent
78d49edfeb
commit
7eb15f2477
3 changed files with 5 additions and 11 deletions
|
|
@ -20,7 +20,7 @@ def pretty_cmd(cmd: list[str], wd=None):
|
|||
if token.find(' ') != -1:
|
||||
token = '"' + token + '"'
|
||||
tokens.append(token)
|
||||
ret = ' '.join(tokens)
|
||||
ret = '>' + ' '.join(tokens) + '<'
|
||||
if wd is not None:
|
||||
ret += f' in {wd}'
|
||||
return ret
|
||||
|
|
@ -57,10 +57,7 @@ async def run_cmd(
|
|||
|
||||
def __check_exit_code(code):
|
||||
if code != 0 and (throw or verbose):
|
||||
msg = (
|
||||
time.strftime("%Y-%m-%d %H:%M")
|
||||
+ f': Command returned error {code}: "{pretty_cmd(args, wd)}"'
|
||||
)
|
||||
msg = f'Command returned error {code}: {pretty_cmd(args, wd)}'
|
||||
if verbose:
|
||||
__log(ERR, msg)
|
||||
if throw:
|
||||
|
|
@ -184,7 +181,7 @@ async def run_curl(args: list[str], parse_json: bool=True, wd=None, throw=None,
|
|||
size = len(ret)
|
||||
except:
|
||||
pass
|
||||
print(f'Failed to parse {size} bytes output of command >{pretty_cmd(cmd, wd)}< ({e})', file=sys.stderr)
|
||||
print(f'Failed to parse {size} bytes output of command >{pretty_cmd(cmd, wd)}< ({str(e)})', file=sys.stderr)
|
||||
raise
|
||||
return ret
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue