Ensure health probe is stopped when a container exits

runcom · runcom · commit 7ea6a6707891 · 2018-10-23T12:46:50.000+02:00
Signed-off-by: Antonio Murdaca &lt;runcom@redhat.com&gt;
diff --git a/daemon/monitor.go b/daemon/monitor.go
@@ -45,7 +45,9 @@ func (daemon *Daemon) StateChanged(id string, e libcontainerd.StateInfo) error {
 			defer daemon.autoRemove(c)
 		}
 
-		daemon.updateHealthMonitor(c)
+		// cancel healthcheck here, they will be automatically
+		// restarted if/when the container is started again
+		daemon.stopHealthchecks(c)
 		attributes := map[string]string{
 			"exitCode": strconv.Itoa(int(e.ExitCode)),
 		}

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,9 @@ func (daemon *Daemon) StateChanged(id string, e libcontainerd.StateInfo) error {`
`45`	`45`	`defer daemon.autoRemove(c)`
`46`	`46`	`}`
`47`	`47`
`48`		`- daemon.updateHealthMonitor(c)`
	`48`	`+ // cancel healthcheck here, they will be automatically`
	`49`	`+ // restarted if/when the container is started again`
	`50`	`+ daemon.stopHealthchecks(c)`
`49`	`51`	`attributes := map[string]string{`
`50`	`52`	`"exitCode": strconv.Itoa(int(e.ExitCode)),`
`51`	`53`	`}`