From 88a8d9e3fa19cf16b19716cb03fa457d98056010 Mon Sep 17 00:00:00 2001 From: Abhijeet Kasurde Date: Tue, 18 Feb 2020 16:16:23 +0530 Subject: [WIP] Add cmd flag to show container name in log This flag allows user to show container name in podman log command Fixes: #4962 Signed-off-by: Abhijeet Kasurde --- libpod/logs/log.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'libpod/logs') diff --git a/libpod/logs/log.go b/libpod/logs/log.go index 9a7bcb5be..180b3f14b 100644 --- a/libpod/logs/log.go +++ b/libpod/logs/log.go @@ -35,6 +35,7 @@ type LogOptions struct { Timestamps bool Multi bool WaitGroup *sync.WaitGroup + UseNames bool } // LogLine describes the information for each line of a log @@ -44,6 +45,7 @@ type LogLine struct { Time time.Time Msg string CID string + CName string } // GetLogFile returns an hp tail for a container given options @@ -120,11 +122,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.UseNames { + 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)) -- cgit v1.2.3-54-g00ecf