소스 검색

Fix log statement 'failed to exit' timeout accuracy

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 <gh@sparr.email>
(cherry picked from commit d15ce134efadeb7cc3b370de6acfbb7accfb691b)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Cam 4 년 전
부모
커밋
3285c27503
1개의 변경된 파일1개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 1
      daemon/stop.go

+ 1 - 1
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