summaryrefslogtreecommitdiff
path: root/libpod/runtime.go
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2022-01-12 15:46:53 -0500
committerDaniel J Walsh <dwalsh@redhat.com>2022-01-13 08:14:50 -0500
commitfa6405c3c39c2f054d71323256c65bef34d7aed0 (patch)
tree28c0cb43aab46e780d843599460a00e9daa8d3af /libpod/runtime.go
parentcb06133d42e4041fe19d2e66f254abf188f1025e (diff)
downloadpodman-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/runtime.go')
-rw-r--r--libpod/runtime.go4
1 files changed, 3 insertions, 1 deletions
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 != "" {