summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-12-04 06:28:34 -0500
committerGitHub <noreply@github.com>2020-12-04 06:28:34 -0500
commit05df0c50aed0639fe382efa7d7199083cc09dbc4 (patch)
tree59ccf5b6fa678384ff83ee0ee1288de92d197041
parentd1193b1b8ca6da720b5d4eafff5733e367c07578 (diff)
parente58fb21ced99db634a38c9e8fbfd04044efe3131 (diff)
downloadpodman-05df0c50aed0639fe382efa7d7199083cc09dbc4.tar.gz
podman-05df0c50aed0639fe382efa7d7199083cc09dbc4.tar.bz2
podman-05df0c50aed0639fe382efa7d7199083cc09dbc4.zip
Merge pull request #8589 from yan12125/container-logs-unix-timestamps
Support Unix timestamps for `podman logs --since`
-rw-r--r--pkg/util/utils.go5
-rw-r--r--test/system/035-logs.bats3
2 files changed, 8 insertions, 0 deletions
diff --git a/pkg/util/utils.go b/pkg/util/utils.go
index f6a084c00..e0f631eb4 100644
--- a/pkg/util/utils.go
+++ b/pkg/util/utils.go
@@ -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
duration, err := time.ParseDuration(inputTime)
if err != nil {
diff --git a/test/system/035-logs.bats b/test/system/035-logs.bats
index a3d6a5800..a081a7ce1 100644
--- a/test/system/035-logs.bats
+++ b/test/system/035-logs.bats
@@ -21,6 +21,9 @@ load helpers
run_podman logs $cid
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
}