Fix log statement 'failed to exit' timeout accuracy

sparrc · sparrc · commit d15ce134efad · 2021-06-08T13:37:58.000-07:00
log statement should reflect how long it actually waited, not how long
it theoretically could wait based on the 'seconds' integer passed in.

Signed-off-by: Cam &lt;gh@sparr.email&gt;
diff --git a/daemon/stop.go b/daemon/stop.go
@@ -83,7 +83,7 @@ func (daemon *Daemon) containerStop(container *containerpkg.Container, seconds i
 		return err
 	}
 
-	logrus.WithField("container", container.ID).Infof("Container failed to exit within %d seconds of signal %d - using the force", seconds, stopSignal)
+	logrus.WithField("container", container.ID).Infof("Container failed to exit within %s of signal %d - using the force", wait, stopSignal)
 	// Stop either failed or container didnt exit, so fallback to kill.
 	if err := daemon.Kill(container); err != nil {
 		// got a kill error, but give container 2 more seconds to exit just in case

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ func (daemon Daemon) containerStop(container containerpkg.Container, seconds i`
`83`	`83`	`return err`
`84`	`84`	`}`
`85`	`85`
`86`		`- logrus.WithField("container", container.ID).Infof("Container failed to exit within %d seconds of signal %d - using the force", seconds, stopSignal)`
	`86`	`+ logrus.WithField("container", container.ID).Infof("Container failed to exit within %s of signal %d - using the force", wait, stopSignal)`
`87`	`87`	`// Stop either failed or container didnt exit, so fallback to kill.`
`88`	`88`	`if err := daemon.Kill(container); err != nil {`
`89`	`89`	`// got a kill error, but give container 2 more seconds to exit just in case`