diff options
Diffstat (limited to 'libpod/container_log_linux.go')
| -rw-r--r-- | libpod/container_log_linux.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libpod/container_log_linux.go b/libpod/container_log_linux.go index 4029d0af7..324aa3b98 100644 --- a/libpod/container_log_linux.go +++ b/libpod/container_log_linux.go @@ -44,6 +44,12 @@ func (c *Container) initializeJournal(ctx context.Context) error { } func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOptions, logChannel chan *logs.LogLine) error { + // We need the container's events in the same journal to guarantee + // consistency, see #10323. + if options.Follow && c.runtime.config.Engine.EventsLogger != "journald" { + return errors.Errorf("using --follow with the journald --log-driver but without the journald --events-backend (%s) is not supported", c.runtime.config.Engine.EventsLogger) + } + journal, err := sdjournal.NewJournal() if err != nil { return err @@ -105,12 +111,6 @@ func (c *Container) readFromJournal(ctx context.Context, options *logs.LogOption return errors.Wrap(cursorError, "initial journal cursor") } - // We need the container's events in the same journal to guarantee - // consistency, see #10323. - if options.Follow && c.runtime.config.Engine.EventsLogger != "journald" { - return errors.Errorf("using --follow with the journald --log-driver but without the journald --events-backend (%s) is not supported", c.runtime.config.Engine.EventsLogger) - } - options.WaitGroup.Add(1) go func() { defer func() { |