opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-24 01:50:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

libpod: runtime newEventer() cleanup

Browse Source 
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:
Paul Holzinger
2022-09-09 13:31:03 +02:00
parent 76980a2226
commit cd32b929e3
1 changed files with 2 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libpod/events.go
View File

@ -133,11 +133,7 @@ func (v *Volume) newVolumeEvent(status events.Status) {
// Events is a wrapper function for everyone to begin tailing the events log // Events is a wrapper function for everyone to begin tailing the events log
// with options // with options
func (r *Runtime) Events(ctx context.Context, options events.ReadOptions) error { func (r *Runtime) Events(ctx context.Context, options events.ReadOptions) error {
eventer, err := r.newEventer() return r.eventer.Read(ctx, options)
if err != nil {
return err
}
return eventer.Read(ctx, options)
} }
// GetEvents reads the event log and returns events based on input filters // 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, FromStart: true,
Stream: false, Stream: false,
} }
eventer, err := r.newEventer()
if err != nil {
return nil, err
}
logEvents := make([]*events.Event, 0, len(eventChannel)) logEvents := make([]*events.Event, 0, len(eventChannel))
readLock := sync.Mutex{} readLock := sync.Mutex{}
@ -164,7 +156,7 @@ func (r *Runtime) GetEvents(ctx context.Context, filters []string) ([]*events.Ev
readLock.Unlock() readLock.Unlock()
}() }()
readErr := eventer.Read(ctx, options) readErr := r.eventer.Read(ctx, options)
readLock.Lock() // Wait for the events to be consumed. readLock.Lock() // Wait for the events to be consumed.
return logEvents, readErr return logEvents, readErr
} }