janware/jw-pkg
1
mirror of ssh://git.janware.com/janware/proj/jw-pkg synced 2026-04-25 09:35:54 +02:00
Code Activity Actions

jw.pkg.lib: Don't log {e}

Browse source 
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:
Jan Lindemann 2026-02-18 11:23:37 +01:00
commit 7eb15f2477
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/python/jw/pkg/lib/App.py
View file

@ -116,10 +116,7 @@ class App: # export
try:
ret = await self._run(self.__args)
except Exception as e:
if hasattr(e, 'message'):
log(ERR, e.message)
else:
log(ERR, f'Exception: {type(e)}: {e}')
log(ERR, repr(e) if self.__back_trace else str(e))
exit_status = 1
if self.__back_trace:
raise

2
src/python/jw/pkg/lib/Cmd.py
View file

@ -89,7 +89,7 @@ class Cmd(abc.ABC): # export
self.__children.append(cmd)
assert len(self.__children) == len(self.__child_classes)
except Exception as e:
cmds.dump(ERR, f"Failed to add subcommands ({e})")
cmds.dump(ERR, f"Failed to add subcommands ({str(e)})")
raise
return
raise Exception(f'Tried to add sub-commands of unknown type {type(cmds)}')

9
src/python/jw/pkg/lib/util.py
View file

@ -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