diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-01-12 15:46:53 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-01-13 08:14:50 -0500 |
| commit | fa6405c3c39c2f054d71323256c65bef34d7aed0 (patch) | |
| tree | 28c0cb43aab46e780d843599460a00e9daa8d3af /libpod | |
| parent | cb06133d42e4041fe19d2e66f254abf188f1025e (diff) | |
| download | podman-fa6405c3c39c2f054d71323256c65bef34d7aed0.tar.gz podman-fa6405c3c39c2f054d71323256c65bef34d7aed0.tar.bz2 podman-fa6405c3c39c2f054d71323256c65bef34d7aed0.zip | |
use events_logfile_path from containers.conf for events log.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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 != "" { |