summaryrefslogtreecommitdiff
path: root/libpod/logs/log.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-02-28 18:55:58 +0100
committerGitHub <noreply@github.com>2020-02-28 18:55:58 +0100
commita58bf77d3eb31b48fd8904b782543e3fe364df66 (patch)
tree4b24e15baceda19e57de1a3345a23b576f4741a5 /libpod/logs/log.go
parentc19269639359e24be9a50143faac47b473522c91 (diff)
parent7f411cb325986e88f1b04c2fc2a0e17a9e283ddf (diff)
downloadpodman-a58bf77d3eb31b48fd8904b782543e3fe364df66.tar.gz
podman-a58bf77d3eb31b48fd8904b782543e3fe364df66.tar.bz2
podman-a58bf77d3eb31b48fd8904b782543e3fe364df66.zip
Merge pull request #5244 from Akasurde/i4962
Add cmd flag to show container name in log
Diffstat (limited to 'libpod/logs/log.go')
-rw-r--r--libpod/logs/log.go15
1 files changed, 11 insertions, 4 deletions
diff --git a/libpod/logs/log.go b/libpod/logs/log.go
index bd918abae..200ef3e99 100644
--- a/libpod/logs/log.go
+++ b/libpod/logs/log.go
@@ -38,6 +38,7 @@ type LogOptions struct {
Timestamps bool
Multi bool
WaitGroup *sync.WaitGroup
+ UseName bool
}
// LogLine describes the information for each line of a log
@@ -47,6 +48,7 @@ type LogLine struct {
Time time.Time
Msg string
CID string
+ CName string
}
// GetLogFile returns an hp tail for a container given options
@@ -164,11 +166,16 @@ func getTailLog(path string, tail int) ([]*LogLine, error) {
func (l *LogLine) String(options *LogOptions) string {
var out string
if options.Multi {
- cid := l.CID
- if len(cid) > 12 {
- cid = cid[:12]
+ if options.UseName {
+ cname := l.CName
+ out = fmt.Sprintf("%s ", cname)
+ } else {
+ cid := l.CID
+ if len(cid) > 12 {
+ cid = cid[:12]
+ }
+ out = fmt.Sprintf("%s ", cid)
}
- out = fmt.Sprintf("%s ", cid)
}
if options.Timestamps {
out += fmt.Sprintf("%s ", l.Time.Format(LogTimeFormat))