diff --git a/pkg/ioutils/multireader.go b/daemon/logger/jsonfilelog/multireader/multireader.go similarity index 99% rename from pkg/ioutils/multireader.go rename to daemon/logger/jsonfilelog/multireader/multireader.go index edb043ddc3..06a7307ce4 100644 --- a/pkg/ioutils/multireader.go +++ b/daemon/logger/jsonfilelog/multireader/multireader.go @@ -1,4 +1,4 @@ -package ioutils +package multireader import ( "bytes" diff --git a/pkg/ioutils/multireader_test.go b/daemon/logger/jsonfilelog/multireader/multireader_test.go similarity index 99% rename from pkg/ioutils/multireader_test.go rename to daemon/logger/jsonfilelog/multireader/multireader_test.go index 0604739897..bd59b78ca7 100644 --- a/pkg/ioutils/multireader_test.go +++ b/daemon/logger/jsonfilelog/multireader/multireader_test.go @@ -1,4 +1,4 @@ -package ioutils +package multireader import ( "bytes" diff --git a/daemon/logger/jsonfilelog/read.go b/daemon/logger/jsonfilelog/read.go index 9f282eafbb..312aa551d0 100644 --- a/daemon/logger/jsonfilelog/read.go +++ b/daemon/logger/jsonfilelog/read.go @@ -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) }