diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-10-30 07:49:28 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-30 07:49:28 -0700 |
| commit | ce24ce7c530f8fb0354d3af7b394240a3915b733 (patch) | |
| tree | 230cc7586cf8d333680f27b915a65cf587e72a6b | |
| parent | 24d4f114ea180ffae63c8a9a92049e4b873f6f5c (diff) | |
| parent | aa49675e294f075ae98141327246ec08ae84b512 (diff) | |
| download | podman-ce24ce7c530f8fb0354d3af7b394240a3915b733.tar.gz podman-ce24ce7c530f8fb0354d3af7b394240a3915b733.tar.bz2 podman-ce24ce7c530f8fb0354d3af7b394240a3915b733.zip | |
Merge pull request #1728 from baude/trunccommand
truncate command output in ps by default
| -rw-r--r-- | cmd/podman/shared/container.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go index b847314a4..4404268d4 100644 --- a/cmd/podman/shared/container.go +++ b/cmd/podman/shared/container.go @@ -24,6 +24,7 @@ import ( const ( cidTruncLength = 12 podTruncLength = 12 + cmdTruncLength = 17 ) // PsOptions describes the struct being formed for ps @@ -191,9 +192,12 @@ func NewBatchContainer(ctr *libpod.Container, opts PsOptions) (PsContainerOutput pod := ctr.PodID() if !opts.NoTrunc { cid = cid[0:cidTruncLength] - if len(pod) > 12 { + if len(pod) > podTruncLength { pod = pod[0:podTruncLength] } + if len(command) > cmdTruncLength { + command = command[0:cmdTruncLength] + "..." + } } pso.ID = cid |