diff --git a/components/engine/daemon/logger/jsonfilelog/jsonfilelog.go b/components/engine/daemon/logger/jsonfilelog/jsonfilelog.go index f9aac82fe5..177c070394 100644 --- a/components/engine/daemon/logger/jsonfilelog/jsonfilelog.go +++ b/components/engine/daemon/logger/jsonfilelog/jsonfilelog.go @@ -12,8 +12,8 @@ import ( "sync" "github.com/docker/docker/daemon/logger" + "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog" "github.com/docker/docker/daemon/logger/loggerutils" - "github.com/docker/docker/pkg/jsonlog" units "github.com/docker/go-units" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/components/engine/daemon/logger/jsonfilelog/jsonfilelog_test.go b/components/engine/daemon/logger/jsonfilelog/jsonfilelog_test.go index e3ebc64d0e..2b2b2b5229 100644 --- a/components/engine/daemon/logger/jsonfilelog/jsonfilelog_test.go +++ b/components/engine/daemon/logger/jsonfilelog/jsonfilelog_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/docker/docker/daemon/logger" - "github.com/docker/docker/pkg/jsonlog" + "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog" "github.com/gotestyourself/gotestyourself/fs" "github.com/stretchr/testify/require" ) diff --git a/components/engine/pkg/jsonlog/jsonlog.go b/components/engine/daemon/logger/jsonfilelog/jsonlog/jsonlog.go similarity index 100% rename from components/engine/pkg/jsonlog/jsonlog.go rename to components/engine/daemon/logger/jsonfilelog/jsonlog/jsonlog.go diff --git a/components/engine/pkg/jsonlog/jsonlogbytes.go b/components/engine/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes.go similarity index 100% rename from components/engine/pkg/jsonlog/jsonlogbytes.go rename to components/engine/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes.go diff --git a/components/engine/pkg/jsonlog/jsonlogbytes_test.go b/components/engine/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes_test.go similarity index 100% rename from components/engine/pkg/jsonlog/jsonlogbytes_test.go rename to components/engine/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes_test.go diff --git a/components/engine/pkg/jsonlog/time_marshalling.go b/components/engine/daemon/logger/jsonfilelog/jsonlog/time_marshalling.go similarity index 100% rename from components/engine/pkg/jsonlog/time_marshalling.go rename to components/engine/daemon/logger/jsonfilelog/jsonlog/time_marshalling.go diff --git a/components/engine/pkg/jsonlog/time_marshalling_test.go b/components/engine/daemon/logger/jsonfilelog/jsonlog/time_marshalling_test.go similarity index 100% rename from components/engine/pkg/jsonlog/time_marshalling_test.go rename to components/engine/daemon/logger/jsonfilelog/jsonlog/time_marshalling_test.go diff --git a/components/engine/daemon/logger/jsonfilelog/read.go b/components/engine/daemon/logger/jsonfilelog/read.go index 7f22cc4703..2586c7d7f7 100644 --- a/components/engine/daemon/logger/jsonfilelog/read.go +++ b/components/engine/daemon/logger/jsonfilelog/read.go @@ -13,9 +13,9 @@ import ( "github.com/docker/docker/api/types/backend" "github.com/docker/docker/daemon/logger" + "github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog" "github.com/docker/docker/daemon/logger/jsonfilelog/multireader" "github.com/docker/docker/pkg/filenotify" - "github.com/docker/docker/pkg/jsonlog" "github.com/docker/docker/pkg/tailfile" "github.com/pkg/errors" "github.com/sirupsen/logrus" diff --git a/components/engine/daemon/logger/jsonfilelog/read_test.go b/components/engine/daemon/logger/jsonfilelog/read_test.go index ffae3b0ab5..01a05c4b78 100644 --- a/components/engine/daemon/logger/jsonfilelog/read_test.go +++ b/components/engine/daemon/logger/jsonfilelog/read_test.go @@ -1,9 +1,8 @@ package jsonfilelog import ( - "testing" - "bytes" + "testing" "time" "github.com/docker/docker/daemon/logger"