opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-04 10:10:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

use events_logfile_path from containers.conf for events log.

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2022-01-12 15:46:53 -05:00
parent cb06133d42
commit fa6405c3c3
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libpod/options.go
View File

@ -500,8 +500,6 @@ func WithEventsLogger(logger string) RuntimeOption {
} }
rt.config.Engine.EventsLogger = logger rt.config.Engine.EventsLogger = logger
rt.config.Engine.EventsLogFilePath = filepath.Join(rt.config.Engine.TmpDir, "events", "events.log")
return nil return nil
} }
} }

4
libpod/runtime.go
View File

@ -1114,7 +1114,9 @@ func (r *Runtime) mergeDBConfig(dbConfig *DBConfig) {
logrus.Debugf("Overriding tmp dir %q with %q from database", c.TmpDir, dbConfig.LibpodTmp) logrus.Debugf("Overriding tmp dir %q with %q from database", c.TmpDir, dbConfig.LibpodTmp)
} }
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 != "" { if !r.storageSet.VolumePathSet && dbConfig.VolumePath != "" {

13
test/system/090-events.bats
View File

@ -116,3 +116,16 @@ function _events_disjunctive_filters() {
@test "events with disjunctive filters - default" { @test "events with disjunctive filters - default" {
_events_disjunctive_filters "" _events_disjunctive_filters ""
} }
@test "events with events_logfile_path in containers.conf" {
skip_if_remote "remote does not support --events-backend"
events_file=$PODMAN_TMPDIR/events.log
containersconf=$PODMAN_TMPDIR/containers.conf
cat >$containersconf <<EOF
[engine]
events_logfile_path="$events_file"
EOF
CONTAINERS_CONF="$containersconf" run_podman --events-backend=file pull $IMAGE
run cat $events_file
is "$output" ".*\"Name\":\"$IMAGE" "test"
}