mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Merge pull request #33479 from vieux/move_multireader
move multireader out of /pkg
This commit is contained in:
commit
096eeb3e75
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)
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue