penguin86/selfhost-utils
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added two checks, better error reporting

Browse Source
This commit is contained in:
Daniele Verducci (Slimpenguin)
2022-04-07 08:50:54 +02:00
parent 73cf1e3984
commit af9cbbf393
2 changed files with 52 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
healthcheck/healthcheck.py
View File

@@ -112,12 +112,15 @@ class Main:
stdout = ""
ret = subprocess.run(config.command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
if ret.stderr:
self._log.info('{} subprocess stderr:\n{}', config.command, ret.stderr.decode())
self._log.info('{} subprocess stderr:\n{}'.format(config.command, ret.stderr.decode()))
if ret.stdout:
stdout = ret.stdout.decode()
self._log.debug('{} subprocess stdout:\n{}', config.command, stdout)
self._log.debug('{} subprocess stdout:\n{}'.format(config.command, stdout))
if ret.returncode != 0:
return 'subprocess {} exited with error code {}'.format(config.command, ret.returncode)
return 'the command exited with error code {} {}'.format(
ret.returncode,
'and error message "{}"'.format(ret.stderr.decode().strip()) if ret.stderr else ''
)
# Parse result with regex
match = re.search(config.regexp, stdout, re.MULTILINE)