opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-21 17:38:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8589 from yan12125/container-logs-unix-timestamps

Browse Source 
Support Unix timestamps for `podman logs --since`
This commit is contained in:
OpenShift Merge Robot
2020-12-04 06:28:34 -05:00
committed by GitHub
parent d1193b1b8c e58fb21ced
commit 05df0c50ae
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/util/utils.go
View File

@ -530,6 +530,11 @@ func ParseInputTime(inputTime string) (time.Time, error) {
} }
} }
unix_timestamp, err := strconv.ParseInt(inputTime, 10, 64)
if err == nil {
return time.Unix(unix_timestamp, 0), nil
}
// input might be a duration // input might be a duration
duration, err := time.ParseDuration(inputTime) duration, err := time.ParseDuration(inputTime)
if err != nil { if err != nil {

3
test/system/035-logs.bats
View File

@ -21,6 +21,9 @@ load helpers
run_podman logs $cid run_podman logs $cid
is "$output" "$rand_string" "output from podman-logs after container is run" is "$output" "$rand_string" "output from podman-logs after container is run"
# test --since with Unix timestamps
run_podman logs --since 1000 $cid
run_podman rm $cid run_podman rm $cid
} }