docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-13 18:22:35 +03:00
Code Activity

Add RestartPolicy methods instead of using strings checking

Browse Source 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 624bf81fdb980638c422d746bfb82623e9d8bbd1
Component: engine
This commit is contained in:
Antonio Murdaca
2015-05-16 13:34:09 +02:00
parent 07c8ebe4df
commit 0dbe0e42c5
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/api/client/run.go
View File

@@ -122,7 +122,7 @@ func (cli *DockerCli) CmdRun(args ...string) error {
fmt.Fprintf(cli.out, "%s\n", createResponse.ID)
}()
}
if *flAutoRemove && (hostConfig.RestartPolicy.Name == "always" || hostConfig.RestartPolicy.Name == "on-failure") {
if *flAutoRemove && (hostConfig.RestartPolicy.IsAlways() || hostConfig.RestartPolicy.IsOnFailure()) {
return ErrConflictRestartPolicyAndAutoRemove
}
// We need to instantiate the chan because the select needs it. It can

4
components/engine/daemon/daemon.go
View File

@@ -325,8 +325,8 @@ func (daemon *Daemon) restore() error {
logrus.Debug("Restarting containers...")
for _, container := range registeredContainers {
if container.hostConfig.RestartPolicy.Name == "always" ||
(container.hostConfig.RestartPolicy.Name == "on-failure" && container.ExitCode != 0) {
if container.hostConfig.RestartPolicy.IsAlways() ||
(container.hostConfig.RestartPolicy.IsOnFailure() && container.ExitCode != 0) {
logrus.Debugf("Starting container %s", container.ID)
if err := container.Start(); err != nil {

6
components/engine/daemon/monitor.go
View File

@@ -223,10 +223,10 @@ func (m *containerMonitor) shouldRestart(exitCode int) bool {
return false
}
switch m.restartPolicy.Name {
case "always":
switch {
case m.restartPolicy.IsAlways():
return true
case "on-failure":
case m.restartPolicy.IsOnFailure():
// the default value of 0 for MaximumRetryCount means that we will not enforce a maximum count
if max := m.restartPolicy.MaximumRetryCount; max != 0 && m.failureCount > max {
logrus.Debugf("stopping restart of container %s because maximum failure could of %d has been reached",

12
components/engine/runconfig/hostconfig.go
View File

@@ -129,6 +129,18 @@ type RestartPolicy struct {
MaximumRetryCount int
}
func (rp *RestartPolicy) IsNone() bool {
return rp.Name == "no"
}
func (rp *RestartPolicy) IsAlways() bool {
return rp.Name == "always"
}
func (rp *RestartPolicy) IsOnFailure() bool {
return rp.Name == "on-failure"
}
type LogConfig struct {
Type string
Config map[string]string