clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-09-06 13:41:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13165 from ahmetalpbalkan/durations

Browse Source 
Allow duration strings as --since/--until
This commit is contained in:
Antonio Murdaca
2015-06-03 22:14:42 +02:00
parent a29633f687 4e3b21f99e
commit f18ce101fb
8 changed files with 65 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/client/events.go
+4 -2
View File
@@ -2,6 +2,7 @@ package client
import (
"net/url"
"time"
"github.com/docker/docker/opts"
flag "github.com/docker/docker/pkg/mflag"
@@ -36,11 +37,12 @@ func (cli *DockerCli) CmdEvents(args ...string) error {
return err
}
}
ref := time.Now()
if *since != "" {
v.Set("since", timeutils.GetTimestamp(*since))
v.Set("since", timeutils.GetTimestamp(*since, ref))
}
if *until != "" {
v.Set("until", timeutils.GetTimestamp(*until))
v.Set("until", timeutils.GetTimestamp(*until, ref))
}
if len(eventFilterArgs) > 0 {
filterJSON, err := filters.ToParam(eventFilterArgs)
api/client/logs.go
+2 -1
View File
@@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"net/url"
"time"
"github.com/docker/docker/api/types"
flag "github.com/docker/docker/pkg/mflag"
@@ -46,7 +47,7 @@ func (cli *DockerCli) CmdLogs(args ...string) error {
v.Set("stderr", "1")
if *since != "" {
v.Set("since", timeutils.GetTimestamp(*since))
v.Set("since", timeutils.GetTimestamp(*since, time.Now()))
}
if *times {