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

Support Unix timestamps for `podman logs --since`
containers · Dec 4, 2020 · 05df0c5 · 05df0c5
2 parents d1193b1 + e58fb21
commit 05df0c5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -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
 }