summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-05-29 19:44:06 +0200
committerGitHub <noreply@github.com>2019-05-29 19:44:06 +0200
commit8a8db34131c213c3880940284c2fa278ae48cd7d (patch)
tree21ded05e972d20b97319f4b4666b8ece707bb51e
parent294448c2ea880ec550548537b0681a0e30e161d7 (diff)
parente30a428b653b4da7b9d813d72b56939878fb0f4d (diff)
downloadpodman-8a8db34131c213c3880940284c2fa278ae48cd7d.tar.gz
podman-8a8db34131c213c3880940284c2fa278ae48cd7d.tar.bz2
podman-8a8db34131c213c3880940284c2fa278ae48cd7d.zip
Merge pull request #3228 from rhatdan/man
Podman logs man page shouldn't include timestamps
-rw-r--r--docs/podman-logs.1.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/docs/podman-logs.1.md b/docs/podman-logs.1.md
index ce5d890ce..7feae1b76 100644
--- a/docs/podman-logs.1.md
+++ b/docs/podman-logs.1.md
@@ -50,7 +50,7 @@ Show timestamps in the log outputs. The default is false
To view a container's logs:
```
-podman logs b3f2436bdb978c1d33b1387afb5d7ba7e3243ed2ce908db431ac0069da86cb45
+podman logs -t b3f2436bdb978c1d33b1387afb5d7ba7e3243ed2ce908db431ac0069da86cb45
2017/08/07 10:16:21 Seeked /var/log/crio/pods/eb296bd56fab164d4d3cc46e5776b54414af3bf543d138746b25832c816b933b/c49f49788da14f776b7aa93fb97a2a71f9912f4e5a3e30397fca7dfe0ee0367b.log - &{Offset:0 Whence:0}
1:C 07 Aug 14:10:09.055 # oO0OoO0OoO0Oo Redis is starting oO0OoO0OoO0Oo
@@ -68,13 +68,13 @@ To view only the last two lines in container's log:
```
podman logs --tail 2 b3f2436bdb97
-1:M 07 Aug 14:10:09.056 # WARNING: The TCP backlog setting of 511 cannot be enforced because /proc/sys/net/core/somaxconn is set to the lower value of 128.
-1:M 07 Aug 14:10:09.056 # Server initialized
+# WARNING: The TCP backlog setting of 511 cannot be enforced because /proc/sys/net/core/somaxconn is set to the lower value of 128.
+# Server initialized
```
To view a containers logs since a certain time:
```
-podman logs --since 2017-08-07T10:10:09.055837383-04:00 myserver
+podman logs -t --since 2017-08-07T10:10:09.055837383-04:00 myserver
1:M 07 Aug 14:10:09.055 # Server can't set maximum open files to 10032 because of OS error: Operation not permitted.
1:M 07 Aug 14:10:09.055 # Current maximum open files is 4096. maxclients has been reduced to 4064 to compensate for low ulimit. If you need higher maxclients increase 'ulimit -n'.
@@ -87,8 +87,8 @@ To view a container's logs generated in the last 10 minutes:
```
podman logs --since 10m myserver
-1:M 07 Aug 14:10:09.055 # Server can't set maximum open files to 10032 because of OS error: Operation not permitted.
-1:M 07 Aug 14:10:09.055 # Current maximum open files is 4096. maxclients has been reduced to 4064 to compensate for low ulimit. If you need higher maxclients increase 'ulimit -n'.
+# Server can't set maximum open files to 10032 because of OS error: Operation not permitted.
+# Current maximum open files is 4096. maxclients has been reduced to 4064 to compensate for low ulimit. If you need higher maxclients increase 'ulimit -n'.
```
## SEE ALSO