From 32612058cb5aebdd6faa02450b23f7a0dcdcf1b9 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Fri, 22 Sep 2017 17:59:46 -0400 Subject: [PATCH] Use a local constant This constant is going to be removed from jsonlog package. Signed-off-by: Daniel Nephin --- cli/command/system/events.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cli/command/system/events.go b/cli/command/system/events.go index 6dbc51e2bc..6eac8f3434 100644 --- a/cli/command/system/events.go +++ b/cli/command/system/events.go @@ -15,7 +15,6 @@ import ( "github.com/docker/cli/templates" "github.com/docker/docker/api/types" eventtypes "github.com/docker/docker/api/types/events" - "github.com/docker/docker/pkg/jsonlog" "github.com/spf13/cobra" "golang.org/x/net/context" ) @@ -104,14 +103,18 @@ func makeTemplate(format string) (*template.Template, error) { return tmpl, tmpl.Execute(ioutil.Discard, &eventtypes.Message{}) } +// rfc3339NanoFixed is similar to time.RFC3339Nano, except it pads nanoseconds +// zeros to maintain a fixed number of characters +const rfc3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00" + // prettyPrintEvent prints all types of event information. // Each output includes the event type, actor id, name and action. // Actor attributes are printed at the end if the actor has any. func prettyPrintEvent(out io.Writer, event eventtypes.Message) error { if event.TimeNano != 0 { - fmt.Fprintf(out, "%s ", time.Unix(0, event.TimeNano).Format(jsonlog.RFC3339NanoFixed)) + fmt.Fprintf(out, "%s ", time.Unix(0, event.TimeNano).Format(rfc3339NanoFixed)) } else if event.Time != 0 { - fmt.Fprintf(out, "%s ", time.Unix(event.Time, 0).Format(jsonlog.RFC3339NanoFixed)) + fmt.Fprintf(out, "%s ", time.Unix(event.Time, 0).Format(rfc3339NanoFixed)) } fmt.Fprintf(out, "%s %s %s", event.Type, event.Action, event.Actor.ID)