mirror of
https://github.com/containers/podman.git
synced 2025-05-17 15:18:43 +08:00
libpod: runtime newEventer() cleanup
There is no reason to create a new eventer every time. The libpod runtime already has one attached which should be used instead. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
@ -133,11 +133,7 @@ func (v *Volume) newVolumeEvent(status events.Status) {
|
||||
// Events is a wrapper function for everyone to begin tailing the events log
|
||||
// with options
|
||||
func (r *Runtime) Events(ctx context.Context, options events.ReadOptions) error {
|
||||
eventer, err := r.newEventer()
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
return eventer.Read(ctx, options)
|
||||
return r.eventer.Read(ctx, options)
|
||||
}
|
||||
|
||||
// GetEvents reads the event log and returns events based on input filters
|
||||
@ -149,10 +145,6 @@ func (r *Runtime) GetEvents(ctx context.Context, filters []string) ([]*events.Ev
|
||||
FromStart: true,
|
||||
Stream: false,
|
||||
}
|
||||
eventer, err := r.newEventer()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
logEvents := make([]*events.Event, 0, len(eventChannel))
|
||||
readLock := sync.Mutex{}
|
||||
@ -164,7 +156,7 @@ func (r *Runtime) GetEvents(ctx context.Context, filters []string) ([]*events.Ev
|
||||
readLock.Unlock()
|
||||
}()
|
||||
|
||||
readErr := eventer.Read(ctx, options)
|
||||
readErr := r.eventer.Read(ctx, options)
|
||||
readLock.Lock() // Wait for the events to be consumed.
|
||||
return logEvents, readErr
|
||||
}
|
||||
|
Reference in New Issue
Block a user