diff options
| -rw-r--r-- | cmd/podman/cliconfig/config.go | 2 | ||||
| -rw-r--r-- | cmd/podman/logs.go | 4 | ||||
| -rw-r--r-- | libpod/logs/log.go | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go index d9b42b99f..ccc30c603 100644 --- a/cmd/podman/cliconfig/config.go +++ b/cmd/podman/cliconfig/config.go @@ -260,7 +260,7 @@ type LogsValues struct { Tail int64 Timestamps bool Latest bool - UseNames bool + UseName bool } type MountValues struct { diff --git a/cmd/podman/logs.go b/cmd/podman/logs.go index 291347adb..4bb26cd07 100644 --- a/cmd/podman/logs.go +++ b/cmd/podman/logs.go @@ -55,7 +55,7 @@ func init() { flags.StringVar(&logsCommand.Since, "since", "", "Show logs since TIMESTAMP") flags.Int64Var(&logsCommand.Tail, "tail", -1, "Output the specified number of LINES at the end of the logs. Defaults to -1, which prints all lines") flags.BoolVarP(&logsCommand.Timestamps, "timestamps", "t", false, "Output the timestamps in the log") - flags.BoolVarP(&logsCommand.UseNames, "names", "n", false, "Output the container name in the log") + flags.BoolVarP(&logsCommand.UseName, "names", "n", false, "Output the container name in the log") markFlagHidden(flags, "details") flags.SetInterspersed(false) @@ -87,7 +87,7 @@ func logsCmd(c *cliconfig.LogsValues) error { Since: sinceTime, Tail: c.Tail, Timestamps: c.Timestamps, - UseNames: c.UseNames, + UseName: c.UseName, } return runtime.Log(c, options) } diff --git a/libpod/logs/log.go b/libpod/logs/log.go index 180b3f14b..c2ce1e426 100644 --- a/libpod/logs/log.go +++ b/libpod/logs/log.go @@ -35,7 +35,7 @@ type LogOptions struct { Timestamps bool Multi bool WaitGroup *sync.WaitGroup - UseNames bool + UseName bool } // LogLine describes the information for each line of a log @@ -122,7 +122,7 @@ func getTailLog(path string, tail int) ([]*LogLine, error) { func (l *LogLine) String(options *LogOptions) string { var out string if options.Multi { - if options.UseNames { + if options.UseName { cname := l.CName out = fmt.Sprintf("%s ", cname) } else { |