diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-13 15:54:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-13 15:54:53 +0100 |
| commit | e98058a3cf4f5ba4cd2d37dfdb2a0951b9aa9730 (patch) | |
| tree | 52468f57df071aee5e731cce14115dc65679c94a /libpod | |
| parent | 1b970e8598bd414dc2e84fbb1334f42065ed8233 (diff) | |
| parent | fa6405c3c39c2f054d71323256c65bef34d7aed0 (diff) | |
| download | podman-e98058a3cf4f5ba4cd2d37dfdb2a0951b9aa9730.tar.gz podman-e98058a3cf4f5ba4cd2d37dfdb2a0951b9aa9730.tar.bz2 podman-e98058a3cf4f5ba4cd2d37dfdb2a0951b9aa9730.zip | |
Merge pull request #12837 from rhatdan/events
use events_logfile_path from containers.conf for events log.
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/options.go | 2 | ||||
| -rw-r--r-- | libpod/runtime.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libpod/options.go b/libpod/options.go index 44505da26..630fe809d 100644 --- a/libpod/options.go +++ b/libpod/options.go @@ -500,8 +500,6 @@ func WithEventsLogger(logger string) RuntimeOption { } rt.config.Engine.EventsLogger = logger - rt.config.Engine.EventsLogFilePath = filepath.Join(rt.config.Engine.TmpDir, "events", "events.log") - return nil } } diff --git a/libpod/runtime.go b/libpod/runtime.go index 3297b1ddd..90cd8ffe0 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -1114,7 +1114,9 @@ func (r *Runtime) mergeDBConfig(dbConfig *DBConfig) { logrus.Debugf("Overriding tmp dir %q with %q from database", c.TmpDir, dbConfig.LibpodTmp) } c.TmpDir = dbConfig.LibpodTmp - c.EventsLogFilePath = filepath.Join(dbConfig.LibpodTmp, "events", "events.log") + if c.EventsLogFilePath == "" { + c.EventsLogFilePath = filepath.Join(dbConfig.LibpodTmp, "events", "events.log") + } } if !r.storageSet.VolumePathSet && dbConfig.VolumePath != "" { |