From a1a5b0a48d9d5233f5ffb2ead7ee492a7c2d42a4 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Thu, 1 Jun 2017 16:22:00 -0700 Subject: [PATCH] move multireader out of /pkg Signed-off-by: Victor Vieux Upstream-commit: 2445e6b99d4beecb25d556d9a099bdf47703e174 Component: engine --- .../logger/jsonfilelog/multireader}/multireader.go | 2 +- .../logger/jsonfilelog/multireader}/multireader_test.go | 2 +- components/engine/daemon/logger/jsonfilelog/read.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) rename components/engine/{pkg/ioutils => daemon/logger/jsonfilelog/multireader}/multireader.go (99%) rename components/engine/{pkg/ioutils => daemon/logger/jsonfilelog/multireader}/multireader_test.go (99%) diff --git a/components/engine/pkg/ioutils/multireader.go b/components/engine/daemon/logger/jsonfilelog/multireader/multireader.go similarity index 99% rename from components/engine/pkg/ioutils/multireader.go rename to components/engine/daemon/logger/jsonfilelog/multireader/multireader.go index edb043ddc3..06a7307ce4 100644 --- a/components/engine/pkg/ioutils/multireader.go +++ b/components/engine/daemon/logger/jsonfilelog/multireader/multireader.go @@ -1,4 +1,4 @@ -package ioutils +package multireader import ( "bytes" diff --git a/components/engine/pkg/ioutils/multireader_test.go b/components/engine/daemon/logger/jsonfilelog/multireader/multireader_test.go similarity index 99% rename from components/engine/pkg/ioutils/multireader_test.go rename to components/engine/daemon/logger/jsonfilelog/multireader/multireader_test.go index 0604739897..bd59b78ca7 100644 --- a/components/engine/pkg/ioutils/multireader_test.go +++ b/components/engine/daemon/logger/jsonfilelog/multireader/multireader_test.go @@ -1,4 +1,4 @@ -package ioutils +package multireader import ( "bytes" diff --git a/components/engine/daemon/logger/jsonfilelog/read.go b/components/engine/daemon/logger/jsonfilelog/read.go index 9f282eafbb..312aa551d0 100644 --- a/components/engine/daemon/logger/jsonfilelog/read.go +++ b/components/engine/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) }