move multireader out of /pkg

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 2445e6b99d4beecb25d556d9a099bdf47703e174
Component: engine
This commit is contained in:
Victor Vieux
2017-06-01 16:22:00 -07:00
parent 10e27f6561
commit a1a5b0a48d
3 changed files with 4 additions and 4 deletions
@@ -1,4 +1,4 @@
package ioutils
package multireader
import (
"bytes"
@@ -1,4 +1,4 @@
package ioutils
package multireader
import (
"bytes"
@@ -14,8 +14,8 @@ import (
"github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/logger"
"github.com/docker/docker/daemon/logger/jsonfilelog/multireader"
"github.com/docker/docker/pkg/filenotify"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/jsonlog"
"github.com/docker/docker/pkg/tailfile"
)
@@ -77,7 +77,7 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R
defer latestFile.Close()
if config.Tail != 0 {
tailer := ioutils.MultiReadSeeker(append(files, latestFile)...)
tailer := multireader.MultiReadSeeker(append(files, latestFile)...)
tailFile(tailer, logWatcher, config.Tail, config.Since)
}