Fix for issue 7902.

Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros

Signed-off-by: Doug Davis <dug@us.ibm.com>
This commit is contained in:
Doug Davis
2014-09-16 10:28:37 -07:00
parent 25f7840993
commit cd7a5f5c09
6 changed files with 20 additions and 7 deletions
+2 -2
View File
@@ -7,13 +7,13 @@ import (
"io"
"os"
"strconv"
"time"
"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"
)
func (daemon *Daemon) ContainerLogs(job *engine.Job) engine.Status {
@@ -35,7 +35,7 @@ func (daemon *Daemon) ContainerLogs(job *engine.Job) engine.Status {
return job.Errorf("You must choose at least one stream")
}
if times {
format = time.RFC3339Nano
format = utils.RFC3339NanoFixed
}
if tail == "" {
tail = "all"