opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-29 23:22:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1728 from baude/trunccommand

Browse Source 
truncate command output in ps by default
This commit is contained in:
OpenShift Merge Robot
2018-10-30 07:49:28 -07:00
committed by GitHub
parent 24d4f114ea aa49675e29
commit ce24ce7c53
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/podman/shared/container.go
View File

@ -24,6 +24,7 @@ import (
const ( const (
cidTruncLength = 12 cidTruncLength = 12
podTruncLength = 12 podTruncLength = 12
cmdTruncLength = 17
) )
// PsOptions describes the struct being formed for ps // PsOptions describes the struct being formed for ps
@ -191,9 +192,12 @@ func NewBatchContainer(ctr *libpod.Container, opts PsOptions) (PsContainerOutput
pod := ctr.PodID() pod := ctr.PodID()
if !opts.NoTrunc { if !opts.NoTrunc {
cid = cid[0:cidTruncLength] cid = cid[0:cidTruncLength]
if len(pod) > 12 { if len(pod) > podTruncLength {
pod = pod[0:podTruncLength] pod = pod[0:podTruncLength]
} }
if len(command) > cmdTruncLength {
command = command[0:cmdTruncLength] + "..."
}
} }
pso.ID = cid pso.ID = cid