opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move to using constants for valid restart policy types

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon
2019-04-01 19:45:23 -04:00
parent 357e4c37e9
commit 7ba1b609aa
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod/container_api.go
View File

@ -605,13 +605,13 @@ func (c *Container) Cleanup(ctx context.Context) error {
// restart the container.
// However, perform a full validation of restart policy first.
if c.state.RestartPolicyMatch {
if c.config.RestartPolicy == "on-failure" && c.state.ExitCode != 0 {
if c.config.RestartPolicy == RestartPolicyOnFailure && c.state.ExitCode != 0 {
logrus.Debugf("Container %s restart policy trigger: on retry %d (of %d)",
c.ID(), c.state.RestartCount, c.config.RestartRetries)
}
if (c.config.RestartPolicy == "on-failure" && c.state.ExitCode != 0 &&
if (c.config.RestartPolicy == RestartPolicyOnFailure && c.state.ExitCode != 0 &&
(c.config.RestartRetries > 0 && c.state.RestartCount < c.config.RestartRetries)) ||
c.config.RestartPolicy == "always" {
c.config.RestartPolicy == RestartPolicyAlways {
// The container stopped. We need to restart it.
return c.handleRestartPolicy(ctx)
}