Add docker compose logs --until option

Signed-off-by: Afshin Paydar <afshin.paydar@binary.com>
This commit is contained in:
Afshin Paydar 2021-06-16 08:55:53 +08:00
parent 3976abcdc1
commit bbaccb4339
3 changed files with 6 additions and 1 deletions

View File

@ -325,6 +325,7 @@ type LogOptions struct {
Services []string Services []string
Tail string Tail string
Since string Since string
Until string
Follow bool Follow bool
Timestamps bool Timestamps bool
} }

View File

@ -33,6 +33,7 @@ type logsOptions struct {
follow bool follow bool
tail string tail string
since string since string
until string
noColor bool noColor bool
noPrefix bool noPrefix bool
timestamps bool timestamps bool
@ -51,7 +52,8 @@ func logsCommand(p *projectOptions, contextType string, backend compose.Service)
} }
flags := logsCmd.Flags() flags := logsCmd.Flags()
flags.BoolVarP(&opts.follow, "follow", "f", false, "Follow log output.") flags.BoolVarP(&opts.follow, "follow", "f", false, "Follow log output.")
flags.StringVar(&opts.since, "since", "", "Show logs since timestamp (e.g. 2013-01-02T13:23:37 or 42m)") flags.StringVar(&opts.since, "since", "", "Show logs since timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)")
flags.StringVar(&opts.until, "until", "", "Show logs before a timestamp (e.g. 2013-01-02T13:23:37Z) or relative (e.g. 42m for 42 minutes)")
flags.BoolVar(&opts.noColor, "no-color", false, "Produce monochrome output.") flags.BoolVar(&opts.noColor, "no-color", false, "Produce monochrome output.")
flags.BoolVar(&opts.noPrefix, "no-log-prefix", false, "Don't print prefix in logs.") flags.BoolVar(&opts.noPrefix, "no-log-prefix", false, "Don't print prefix in logs.")
flags.BoolVarP(&opts.timestamps, "timestamps", "t", false, "Show timestamps.") flags.BoolVarP(&opts.timestamps, "timestamps", "t", false, "Show timestamps.")
@ -73,6 +75,7 @@ func runLogs(ctx context.Context, backend compose.Service, opts logsOptions, ser
Follow: opts.follow, Follow: opts.follow,
Tail: opts.tail, Tail: opts.tail,
Since: opts.since, Since: opts.since,
Until: opts.until,
Timestamps: opts.timestamps, Timestamps: opts.timestamps,
}) })
} }

View File

@ -49,6 +49,7 @@ func (s *composeService) Logs(ctx context.Context, projectName string, consumer
ShowStderr: true, ShowStderr: true,
Follow: options.Follow, Follow: options.Follow,
Since: options.Since, Since: options.Since,
Until: options.Until,
Tail: options.Tail, Tail: options.Tail,
Timestamps: options.Timestamps, Timestamps: options.Timestamps,
}) })