clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7976 from duglin/Issue7902

Browse Source 
Fix for issue 7902 - add trailing zeros to timestamps so logs align
This commit is contained in:
Jessie Frazelle
2014-09-16 13:55:03 -07:00
parent 3ff8d45b35 cd7a5f5c09
commit 51b26853ef
6 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
daemon/logs.go
+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"