kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #33479 from vieux/move_multireader

Browse source 
move multireader out of /pkg
This commit is contained in:
Aaron Lehmann 2017-06-02 12:04:57 +02:00 • committed by GitHub
commit 096eeb3e75
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/ioutils/multireader.go → daemon/logger/jsonfilelog/multireader/multireader.go
View file

@ -1,4 +1,4 @@
package ioutils package multireader
import ( import (
"bytes" "bytes"

2
pkg/ioutils/multireader_test.go → daemon/logger/jsonfilelog/multireader/multireader_test.go
View file

@ -1,4 +1,4 @@
package ioutils package multireader
import ( import (
"bytes" "bytes"

4
daemon/logger/jsonfilelog/read.go
View file

@ -14,8 +14,8 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/daemon/logger" "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/filenotify"
"github.com/docker/docker/pkg/ioutils"
"github.com/docker/docker/pkg/jsonlog" "github.com/docker/docker/pkg/jsonlog"
"github.com/docker/docker/pkg/tailfile" "github.com/docker/docker/pkg/tailfile"
) )
@ -77,7 +77,7 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R
defer latestFile.Close() defer latestFile.Close()
if config.Tail != 0 { if config.Tail != 0 {
tailer := ioutils.MultiReadSeeker(append(files, latestFile)...) tailer := multireader.MultiReadSeeker(append(files, latestFile)...)
tailFile(tailer, logWatcher, config.Tail, config.Since) tailFile(tailer, logWatcher, config.Tail, config.Since)
} }