diff options
author | Lars Wirzenius <liw@liw.fi> | 2021-06-09 08:22:04 +0300 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2021-06-09 08:22:04 +0300 |
commit | 3b5deb4dc34ea5e86bf0124ec96407877eec7882 (patch) | |
tree | a869886fcebd9ffdce13ec9c04d2754433382469 /share | |
parent | 5d20c752b0054958ddcb6e2c9a4c98f1003ac68f (diff) | |
download | subplot-3b5deb4dc34ea5e86bf0124ec96407877eec7882.tar.gz |
feat(lib/daemon.py): split stdout/stderr when logging into lines
Sponsored-by: author
Diffstat (limited to 'share')
-rw-r--r-- | share/python/lib/daemon.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/share/python/lib/daemon.py b/share/python/lib/daemon.py index 11f65bf..0b47fe9 100644 --- a/share/python/lib/daemon.py +++ b/share/python/lib/daemon.py @@ -166,10 +166,9 @@ def daemon_stop(ctx, path=None, args=None, name=None): signo = signal.SIGTERM this = ns[name] - data = open(this["stdout"]).read() - logging.debug(f"{name} stdout, before: {data!r}") - data = open(this["stderr"]).read() - logging.debug(f"{name} stderr, before: {data!r}") + + _daemon_log_long(f"{name} stdout, before:", open(this["stdout"]).read()) + _daemon_log_long(f"{name} stderr, before:", open(this["stderr"]).read()) logging.debug(f"Terminating process {pid} with signal {signo}") try: @@ -186,10 +185,14 @@ def daemon_stop(ctx, path=None, args=None, name=None): break logging.debug(f"Daemon {name} is gone") - data = open(this["stdout"]).read() - logging.debug(f"{name} stdout, after: {data!r}") - data = open(this["stderr"]).read() - logging.debug(f"{name} stderr, after: {data!r}") + _daemon_log_long(f"{name} stdout, after:", open(this["stdout"]).read()) + _daemon_log_long(f"{name} stderr, after:", open(this["stderr"]).read()) + + +def _daemon_log_long(prefix, data): + logging.debug(prefix) + for line in data.splitlines(): + logging.debug(f" {line}") def daemon_no_such_process(ctx, args=None): |