summaryrefslogtreecommitdiff
path: root/libpod/events/events_linux.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-07-10 12:35:48 +0200
committerGitHub <noreply@github.com>2020-07-10 12:35:48 +0200
commit2ac8c6953481eb7391a6a7594709811f7ae3167f (patch)
treea72386000d844e7b9c6f1dd79bf5b77f63a45fd2 /libpod/events/events_linux.go
parentd9cd0032f7478e625329326d7593162a9f1e8c1e (diff)
parent4b784b377cea542228278f2ea501baa32b885be7 (diff)
downloadpodman-2ac8c6953481eb7391a6a7594709811f7ae3167f.tar.gz
podman-2ac8c6953481eb7391a6a7594709811f7ae3167f.tar.bz2
podman-2ac8c6953481eb7391a6a7594709811f7ae3167f.zip
Merge pull request #6917 from mheon/retErr_for_libpod
Remove all instances of named return "err" from Libpod
Diffstat (limited to 'libpod/events/events_linux.go')
-rw-r--r--libpod/events/events_linux.go10
1 files changed, 5 insertions, 5 deletions
diff --git a/libpod/events/events_linux.go b/libpod/events/events_linux.go
index ffb100be8..482d7d6dd 100644
--- a/libpod/events/events_linux.go
+++ b/libpod/events/events_linux.go
@@ -8,20 +8,20 @@ import (
)
// NewEventer creates an eventer based on the eventer type
-func NewEventer(options EventerOptions) (eventer Eventer, err error) {
+func NewEventer(options EventerOptions) (Eventer, error) {
logrus.Debugf("Initializing event backend %s", options.EventerType)
switch strings.ToUpper(options.EventerType) {
case strings.ToUpper(Journald.String()):
- eventer, err = newEventJournalD(options)
+ eventer, err := newEventJournalD(options)
if err != nil {
return nil, errors.Wrapf(err, "eventer creation")
}
+ return eventer, nil
case strings.ToUpper(LogFile.String()):
- eventer = EventLogFile{options}
+ return EventLogFile{options}, nil
case strings.ToUpper(Null.String()):
- eventer = NewNullEventer()
+ return NewNullEventer(), nil
default:
return nil, errors.Errorf("unknown event logger type: %s", strings.ToUpper(options.EventerType))
}
- return eventer, nil
}