opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 17:13:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3093 from baude/healthcheckfixes

Browse Source 
healthcheck benign error
This commit is contained in:
OpenShift Merge Robot
2019-05-13 19:45:21 +02:00
committed by GitHub
parent 2ded1f6199 c71761b9ba
commit e0f1230565
1 changed files with 9 additions and 2 deletions
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" "fmt"
"os" "os"
"os/exec" "os/exec"
"strings"
"github.com/coreos/go-systemd/dbus" "github.com/coreos/go-systemd/dbus"
"github.com/pkg/errors" "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") return errors.Wrapf(err, "unable to get systemd connection to remove healthchecks")
} }
defer conn.Close() defer conn.Close()
serviceFile := fmt.Sprintf("%s.timer", c.ID()) timerFile := fmt.Sprintf("%s.timer", c.ID())
_, err = conn.StopUnit(serviceFile, "fail", nil) _, 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 return err
} }