mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
e611a189cb
If a logdriver doesn't register a callback function to validate log options, it won't be usable. Fix the journald driver by adding a dummy validator. Teach the client and the daemon's "logs" logic that the server can also supply "logs" data via the "journald" driver. Update documentation and tests that depend on error messages. Add support for reading log data from the systemd journal to the journald log driver. The internal logic uses a goroutine to scan the journal for matching entries after any specified cutoff time, formats the messages from those entries as JSONLog messages, and stuffs the results down a pipe whose reading end we hand back to the caller. If we are missing any of the 'linux', 'cgo', or 'journald' build tags, however, we don't implement a reader, so the 'logs' endpoint will still return an error. Make the necessary changes to the build setup to ensure that support for reading container logs from the systemd journal is built. Rename the Jmap member of the journald logdriver's struct to "vars" to make it non-public, and to make it easier to tell that it's just there to hold additional variable values that we want journald to record along with log data that we're sending to it. In the client, don't assume that we know which logdrivers the server implements, and remove the check that looks at the server. It's redundant because the server already knows, and the check also makes using older clients with newer servers (which may have new logdrivers in them) unnecessarily hard. When we try to "logs" and have to report that the container's logdriver doesn't support reading, send the error message through the might-be-a-multiplexer so that clients which are expecting multiplexed data will be able to properly display the error, instead of tripping over the data and printing a less helpful "Unrecognized input header" error. Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
64 lines
1.5 KiB
Go
64 lines
1.5 KiB
Go
package client
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/url"
|
|
"time"
|
|
|
|
"github.com/docker/docker/api/types"
|
|
Cli "github.com/docker/docker/cli"
|
|
flag "github.com/docker/docker/pkg/mflag"
|
|
"github.com/docker/docker/pkg/timeutils"
|
|
)
|
|
|
|
// CmdLogs fetches the logs of a given container.
|
|
//
|
|
// docker logs [OPTIONS] CONTAINER
|
|
func (cli *DockerCli) CmdLogs(args ...string) error {
|
|
cmd := Cli.Subcmd("logs", []string{"CONTAINER"}, "Fetch the logs of a container", true)
|
|
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")
|
|
tail := cmd.String([]string{"-tail"}, "all", "Number of lines to show from the end of the logs")
|
|
cmd.Require(flag.Exact, 1)
|
|
|
|
cmd.ParseFlags(args, true)
|
|
|
|
name := cmd.Arg(0)
|
|
|
|
serverResp, err := cli.call("GET", "/containers/"+name+"/json", nil, nil)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
var c types.ContainerJSON
|
|
if err := json.NewDecoder(serverResp.body).Decode(&c); err != nil {
|
|
return err
|
|
}
|
|
|
|
v := url.Values{}
|
|
v.Set("stdout", "1")
|
|
v.Set("stderr", "1")
|
|
|
|
if *since != "" {
|
|
v.Set("since", timeutils.GetTimestamp(*since, time.Now()))
|
|
}
|
|
|
|
if *times {
|
|
v.Set("timestamps", "1")
|
|
}
|
|
|
|
if *follow {
|
|
v.Set("follow", "1")
|
|
}
|
|
v.Set("tail", *tail)
|
|
|
|
sopts := &streamOpts{
|
|
rawTerminal: c.Config.Tty,
|
|
out: cli.out,
|
|
err: cli.err,
|
|
}
|
|
|
|
_, err = cli.stream("GET", "/containers/"+name+"/logs?"+v.Encode(), sopts)
|
|
return err
|
|
}
|