containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

healthcheck benign error 

clean up the reporting of a benign error that can occur when a container
is first stopped and then removed.

Signed-off-by: baude <bbaude@redhat.com>
This commit is contained in:
baude 2019-05-09 10:49:59 -05:00
parent d2571c7fd4
commit c71761b9ba
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libpod/healthcheck_linux.go
View File

@ -4,6 +4,7 @@ import (
"fmt"
"os"
"os/exec"
"strings"
"github.com/coreos/go-systemd/dbus"
"github.com/pkg/errors"
@ -61,7 +62,13 @@ func (c *Container) removeTimer() error {
return errors.Wrapf(err, "unable to get systemd connection to remove healthchecks")
}
defer conn.Close()
serviceFile := fmt.Sprintf("%s.timer", c.ID())
_, err = conn.StopUnit(serviceFile, "fail", nil)
timerFile := fmt.Sprintf("%s.timer", c.ID())
_, err = conn.StopUnit(timerFile, "fail", nil)
// We want to ignore errors where the timer unit has already been removed. The error
// return is generic so we have to check against the string in the error
if err != nil && strings.HasSuffix(err.Error(), ".timer not loaded.") {
return nil
}
return err
}