mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
cb9a6b9aed
Added --since argument to `docker logs` command. Accept unix timestamps and shows logs only created after the specified date. Default value is 0 and passing default value or not specifying the value in the request causes parameter to be ignored (behavior prior to this change). Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
60 lines
1.6 KiB
Go
60 lines
1.6 KiB
Go
package client
|
|
|
|
import (
|
|
"net/url"
|
|
|
|
"github.com/docker/docker/opts"
|
|
flag "github.com/docker/docker/pkg/mflag"
|
|
"github.com/docker/docker/pkg/parsers/filters"
|
|
"github.com/docker/docker/pkg/timeutils"
|
|
)
|
|
|
|
// CmdEvents prints a live stream of real time events from the server.
|
|
//
|
|
// Usage: docker events [OPTIONS]
|
|
func (cli *DockerCli) CmdEvents(args ...string) error {
|
|
cmd := cli.Subcmd("events", "", "Get real time events from the server", true)
|
|
since := cmd.String([]string{"#since", "-since"}, "", "Show all events created since timestamp")
|
|
until := cmd.String([]string{"-until"}, "", "Stream events until this timestamp")
|
|
flFilter := opts.NewListOpts(nil)
|
|
cmd.Var(&flFilter, []string{"f", "-filter"}, "Filter output based on conditions provided")
|
|
cmd.Require(flag.Exact, 0)
|
|
|
|
cmd.ParseFlags(args, true)
|
|
|
|
var (
|
|
v = url.Values{}
|
|
eventFilterArgs = filters.Args{}
|
|
)
|
|
|
|
// Consolidate all filter flags, and sanity check them early.
|
|
// They'll get process in the daemon/server.
|
|
for _, f := range flFilter.GetAll() {
|
|
var err error
|
|
eventFilterArgs, err = filters.ParseFlag(f, eventFilterArgs)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
}
|
|
if *since != "" {
|
|
v.Set("since", timeutils.GetTimestamp(*since))
|
|
}
|
|
if *until != "" {
|
|
v.Set("until", timeutils.GetTimestamp(*until))
|
|
}
|
|
if len(eventFilterArgs) > 0 {
|
|
filterJSON, err := filters.ToParam(eventFilterArgs)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
v.Set("filters", filterJSON)
|
|
}
|
|
sopts := &streamOpts{
|
|
rawTerminal: true,
|
|
out: cli.out,
|
|
}
|
|
if err := cli.stream("GET", "/events?"+v.Encode(), sopts); err != nil {
|
|
return err
|
|
}
|
|
return nil
|
|
}
|