diff options
author | Valentin Rothberg <rothberg@redhat.com> | 2020-09-29 18:26:15 +0200 |
---|---|---|
committer | Valentin Rothberg <rothberg@redhat.com> | 2020-09-29 18:26:15 +0200 |
commit | b07eb0bc91b6de7c0f3e52cea5611a8b9115d6ca (patch) | |
tree | 04e474797761aabb480fb6021a13b1ed589fb013 /libpod | |
parent | 5cf865926ed62c8baa691f96e8fe5f585e077083 (diff) | |
download | podman-b07eb0bc91b6de7c0f3e52cea5611a8b9115d6ca.tar.gz podman-b07eb0bc91b6de7c0f3e52cea5611a8b9115d6ca.tar.bz2 podman-b07eb0bc91b6de7c0f3e52cea5611a8b9115d6ca.zip |
healthchecks: return systemd-run error
In case `systemd-run` errors when creating transient unit files (and
timers), create an error based on the combined output from stdout and
stderr. Using the error from `exec.Command` contains the exit code
only which is not useful to debug (see #7484).
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r-- | libpod/healthcheck_linux.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libpod/healthcheck_linux.go b/libpod/healthcheck_linux.go index 08f37d412..b0f1ff35d 100644 --- a/libpod/healthcheck_linux.go +++ b/libpod/healthcheck_linux.go @@ -35,9 +35,8 @@ func (c *Container) createTimer() error { conn.Close() logrus.Debugf("creating systemd-transient files: %s %s", "systemd-run", cmd) systemdRun := exec.Command("systemd-run", cmd...) - _, err = systemdRun.CombinedOutput() - if err != nil { - return err + if output, err := systemdRun.CombinedOutput(); err != nil { + return errors.Errorf("%s", output) } return nil } |