From 9ae3134dc9f0652ef48ec1fd445f42d8fe26de35 Mon Sep 17 00:00:00 2001
From: unclejack <unclejacksons@gmail.com>
Date: Mon, 15 Sep 2014 21:44:58 +0300
Subject: [PATCH] add the timeutils package

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
---
 api/client/commands.go                  |  3 ++-
 daemon/logs.go                          |  9 ++++-----
 integration-cli/docker_cli_logs_test.go |  4 ++--
 pkg/timeutils/MAINTAINERS               |  1 +
 pkg/timeutils/json.go                   | 23 +++++++++++++++++++++++
 utils/jsonmessage.go                    |  3 ++-
 utils/utils.go                          |  7 -------
 7 files changed, 34 insertions(+), 16 deletions(-)
 create mode 100644 pkg/timeutils/MAINTAINERS
 create mode 100644 pkg/timeutils/json.go

diff --git a/api/client/commands.go b/api/client/commands.go
index 585ee0066e..8f235d634e 100644
--- a/api/client/commands.go
+++ b/api/client/commands.go
@@ -34,6 +34,7 @@ import (
 	"github.com/docker/docker/pkg/parsers/filters"
 	"github.com/docker/docker/pkg/signal"
 	"github.com/docker/docker/pkg/term"
+	"github.com/docker/docker/pkg/timeutils"
 	"github.com/docker/docker/pkg/units"
 	"github.com/docker/docker/registry"
 	"github.com/docker/docker/runconfig"
@@ -1650,7 +1651,7 @@ func (cli *DockerCli) CmdEvents(args ...string) error {
 		loc = time.FixedZone(time.Now().Zone())
 	)
 	var setTime = func(key, value string) {
-		format := utils.RFC3339NanoFixed
+		format := timeutils.RFC3339NanoFixed
 		if len(value) < len(format) {
 			format = format[:len(value)]
 		}
diff --git a/daemon/logs.go b/daemon/logs.go
index 6a9d3ab67a..b5cf86fcb6 100644
--- a/daemon/logs.go
+++ b/daemon/logs.go
@@ -8,12 +8,11 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/docker/docker/pkg/log"
-	"github.com/docker/docker/pkg/tailfile"
-
 	"github.com/docker/docker/engine"
 	"github.com/docker/docker/pkg/jsonlog"
-	"github.com/docker/docker/utils"
+	"github.com/docker/docker/pkg/log"
+	"github.com/docker/docker/pkg/tailfile"
+	"github.com/docker/docker/pkg/timeutils"
 )
 
 func (daemon *Daemon) ContainerLogs(job *engine.Job) engine.Status {
@@ -35,7 +34,7 @@ func (daemon *Daemon) ContainerLogs(job *engine.Job) engine.Status {
 		return job.Errorf("You must choose at least one stream")
 	}
 	if times {
-		format = utils.RFC3339NanoFixed
+		format = timeutils.RFC3339NanoFixed
 	}
 	if tail == "" {
 		tail = "all"
diff --git a/integration-cli/docker_cli_logs_test.go b/integration-cli/docker_cli_logs_test.go
index b491412711..2407291cdb 100644
--- a/integration-cli/docker_cli_logs_test.go
+++ b/integration-cli/docker_cli_logs_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/docker/docker/utils"
+	"github.com/docker/docker/pkg/timeutils"
 )
 
 // This used to work, it test a log of PageSize-1 (gh#4851)
@@ -104,7 +104,7 @@ func TestLogsTimestamps(t *testing.T) {
 
 	for _, l := range lines {
 		if l != "" {
-			_, err := time.Parse(utils.RFC3339NanoFixed+" ", ts.FindString(l))
+			_, err := time.Parse(timeutils.RFC3339NanoFixed+" ", ts.FindString(l))
 			if err != nil {
 				t.Fatalf("Failed to parse timestamp from %v: %v", l, err)
 			}
diff --git a/pkg/timeutils/MAINTAINERS b/pkg/timeutils/MAINTAINERS
new file mode 100644
index 0000000000..6dde4769d7
--- /dev/null
+++ b/pkg/timeutils/MAINTAINERS
@@ -0,0 +1 @@
+Cristian Staretu <cristian.staretu@gmail.com> (@unclejack)
diff --git a/pkg/timeutils/json.go b/pkg/timeutils/json.go
new file mode 100644
index 0000000000..19f107bffe
--- /dev/null
+++ b/pkg/timeutils/json.go
@@ -0,0 +1,23 @@
+package timeutils
+
+import (
+	"errors"
+	"time"
+)
+
+const (
+	// Define our own version of RFC339Nano because we want one
+	// that pads the nano seconds part with zeros to ensure
+	// the timestamps are aligned in the logs.
+	RFC3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
+	JSONFormat       = `"` + time.RFC3339Nano + `"`
+)
+
+func FastMarshalJSON(t time.Time) (string, error) {
+	if y := t.Year(); y < 0 || y >= 10000 {
+		// RFC 3339 is clear that years are 4 digits exactly.
+		// See golang.org/issue/4556#c15 for more discussion.
+		return "", errors.New("Time.MarshalJSON: year outside of range [0,9999]")
+	}
+	return t.Format(JSONFormat), nil
+}
diff --git a/utils/jsonmessage.go b/utils/jsonmessage.go
index 9b4d935d7e..ca54d05fac 100644
--- a/utils/jsonmessage.go
+++ b/utils/jsonmessage.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/docker/docker/pkg/term"
+	"github.com/docker/docker/pkg/timeutils"
 	"github.com/docker/docker/pkg/units"
 )
 
@@ -100,7 +101,7 @@ func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error {
 		return nil
 	}
 	if jm.Time != 0 {
-		fmt.Fprintf(out, "%s ", time.Unix(jm.Time, 0).Format(RFC3339NanoFixed))
+		fmt.Fprintf(out, "%s ", time.Unix(jm.Time, 0).Format(timeutils.RFC3339NanoFixed))
 	}
 	if jm.ID != "" {
 		fmt.Fprintf(out, "%s: ", jm.ID)
diff --git a/utils/utils.go b/utils/utils.go
index 452db13b8c..eb2f31cecd 100644
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -24,13 +24,6 @@ import (
 	"github.com/docker/docker/pkg/log"
 )
 
-const (
-	// Define our own version of RFC339Nano because we want one
-	// that pads the nano seconds part with zeros to ensure
-	// the timestamps are aligned in the logs.
-	RFC3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
-)
-
 type KeyValuePair struct {
 	Key   string
 	Value string