浏览代码

Fixing logs file handle leak.
Docker logs was only closing the logger when the HTTP response writer received a close notification, however in non-follow mode the writer never receives a close. This means that the daemon would leak the file handle to the log, preventing the container from being removed on Windows (file in use error). This change explicitly closes the log when the end of stream is hit.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>

Stefan J. Wernli 9 年之前
父节点
当前提交
4570cfd3ba
共有 1 个文件被更改,包括 1 次插入0 次删除
  1. 1 0
      daemon/logs.go

+ 1 - 0
daemon/logs.go

@@ -84,6 +84,7 @@ func (daemon *Daemon) ContainerLogs(containerName string, config *backend.Contai
 		case msg, ok := <-logs.Msg:
 			if !ok {
 				logrus.Debugf("logs: end stream")
+				logs.Close()
 				return nil
 			}
 			logLine := msg.Line