Add support for reading logs extra attrs
The jsonlog logger currently allows specifying envs and labels that should be propagated to the log message, however there has been no way to read that back. This adds a new API option to enable inserting these attrs back to the log reader. With timestamps, this looks like so: ``` 92016-04-08T15:28:09.835913720Z foo=bar,hello=world hello ``` The extra attrs are comma separated before the log message but after timestamps. Without timestaps it looks like so: ``` foo=bar,hello=world hello ``` Signed-off-by: Brian Goff <cpuguy83@gmail.com> Upstream-commit: bd9d14a07b9f1c82625dc8483245caf3fa7fe9e6 Component: engine
This commit is contained in:
@ -25,6 +25,7 @@ func (cli *DockerCli) CmdLogs(args ...string) error {
|
||||
follow := cmd.Bool([]string{"f", "-follow"}, false, "Follow log output")
|
||||
since := cmd.String([]string{"-since"}, "", "Show logs since timestamp")
|
||||
times := cmd.Bool([]string{"t", "-timestamps"}, false, "Show timestamps")
|
||||
details := cmd.Bool([]string{"-details"}, false, "Show extra details provided to logs")
|
||||
tail := cmd.String([]string{"-tail"}, "all", "Number of lines to show from the end of the logs")
|
||||
cmd.Require(flag.Exact, 1)
|
||||
|
||||
@ -48,6 +49,7 @@ func (cli *DockerCli) CmdLogs(args ...string) error {
|
||||
Timestamps: *times,
|
||||
Follow: *follow,
|
||||
Tail: *tail,
|
||||
Details: *details,
|
||||
}
|
||||
responseBody, err := cli.client.ContainerLogs(context.Background(), name, options)
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user