From 035604cca6d6bd9a432268caf7515a35023908ed Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 25 Sep 2017 15:57:45 -0400
Subject: [PATCH] Move jsonlog to a subpackage of jsonfilelog

Signed-off-by: Daniel Nephin <dnephin@docker.com>
---
 daemon/logger/jsonfilelog/jsonfilelog.go                       | 2 +-
 daemon/logger/jsonfilelog/jsonfilelog_test.go                  | 2 +-
 {pkg => daemon/logger/jsonfilelog}/jsonlog/jsonlog.go          | 0
 {pkg => daemon/logger/jsonfilelog}/jsonlog/jsonlogbytes.go     | 0
 .../logger/jsonfilelog}/jsonlog/jsonlogbytes_test.go           | 0
 {pkg => daemon/logger/jsonfilelog}/jsonlog/time_marshalling.go | 0
 .../logger/jsonfilelog}/jsonlog/time_marshalling_test.go       | 0
 daemon/logger/jsonfilelog/read.go                              | 2 +-
 daemon/logger/jsonfilelog/read_test.go                         | 3 +--
 9 files changed, 4 insertions(+), 5 deletions(-)
 rename {pkg => daemon/logger/jsonfilelog}/jsonlog/jsonlog.go (100%)
 rename {pkg => daemon/logger/jsonfilelog}/jsonlog/jsonlogbytes.go (100%)
 rename {pkg => daemon/logger/jsonfilelog}/jsonlog/jsonlogbytes_test.go (100%)
 rename {pkg => daemon/logger/jsonfilelog}/jsonlog/time_marshalling.go (100%)
 rename {pkg => daemon/logger/jsonfilelog}/jsonlog/time_marshalling_test.go (100%)

diff --git a/daemon/logger/jsonfilelog/jsonfilelog.go b/daemon/logger/jsonfilelog/jsonfilelog.go
index f9aac82fe5..177c070394 100644
--- a/daemon/logger/jsonfilelog/jsonfilelog.go
+++ b/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/daemon/logger/jsonfilelog/jsonfilelog_test.go b/daemon/logger/jsonfilelog/jsonfilelog_test.go
index e3ebc64d0e..2b2b2b5229 100644
--- a/daemon/logger/jsonfilelog/jsonfilelog_test.go
+++ b/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/pkg/jsonlog/jsonlog.go b/daemon/logger/jsonfilelog/jsonlog/jsonlog.go
similarity index 100%
rename from pkg/jsonlog/jsonlog.go
rename to daemon/logger/jsonfilelog/jsonlog/jsonlog.go
diff --git a/pkg/jsonlog/jsonlogbytes.go b/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes.go
similarity index 100%
rename from pkg/jsonlog/jsonlogbytes.go
rename to daemon/logger/jsonfilelog/jsonlog/jsonlogbytes.go
diff --git a/pkg/jsonlog/jsonlogbytes_test.go b/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes_test.go
similarity index 100%
rename from pkg/jsonlog/jsonlogbytes_test.go
rename to daemon/logger/jsonfilelog/jsonlog/jsonlogbytes_test.go
diff --git a/pkg/jsonlog/time_marshalling.go b/daemon/logger/jsonfilelog/jsonlog/time_marshalling.go
similarity index 100%
rename from pkg/jsonlog/time_marshalling.go
rename to daemon/logger/jsonfilelog/jsonlog/time_marshalling.go
diff --git a/pkg/jsonlog/time_marshalling_test.go b/daemon/logger/jsonfilelog/jsonlog/time_marshalling_test.go
similarity index 100%
rename from pkg/jsonlog/time_marshalling_test.go
rename to daemon/logger/jsonfilelog/jsonlog/time_marshalling_test.go
diff --git a/daemon/logger/jsonfilelog/read.go b/daemon/logger/jsonfilelog/read.go
index 7f22cc4703..2586c7d7f7 100644
--- a/daemon/logger/jsonfilelog/read.go
+++ b/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/daemon/logger/jsonfilelog/read_test.go b/daemon/logger/jsonfilelog/read_test.go
index ffae3b0ab5..01a05c4b78 100644
--- a/daemon/logger/jsonfilelog/read_test.go
+++ b/daemon/logger/jsonfilelog/read_test.go
@@ -1,9 +1,8 @@
 package jsonfilelog
 
 import (
-	"testing"
-
 	"bytes"
+	"testing"
 	"time"
 
 	"github.com/docker/docker/daemon/logger"