opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use "none" instead of "null" for the null eventer

Browse Source 
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
This commit is contained in:
Matthew Heon
2019-08-01 14:57:29 -04:00
parent 6bbeda6da5
commit 8da24f2f7d
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/libpod.conf.5.md
View File

@ -99,7 +99,7 @@ libpod to manage containers.
a slirp4netns network. If "" is used then the binary is looked up using the $PATH environment variable. a slirp4netns network. If "" is used then the binary is looked up using the $PATH environment variable.
**events_logger**="" **events_logger**=""
Default method to use when logging events. Valid values are "file", "journald", and "null". Default method to use when logging events. Valid values are "file", "journald", and "none".
**detach_keys**="" **detach_keys**=""
Keys sequence used for detaching a container Keys sequence used for detaching a container

4
docs/podman.1.md
View File

@ -36,9 +36,9 @@ Note: CGroup manager is not supported in rootless mode when using CGroups Versio
Path to where the cpu performance results should be written Path to where the cpu performance results should be written
**--events-logger**=**type** **--events-logger**=*type*
Backend to use for storing events. Allowed values are **file**, **journald**, and **null**. Backend to use for storing events. Allowed values are **file**, **journald**, and **none**.
**--hooks-dir**=*path* **--hooks-dir**=*path*

2
libpod/events/events.go
View File

@ -22,7 +22,7 @@ func (et EventerType) String() string {
case Journald: case Journald:
return "journald" return "journald"
case Null: case Null:
return "null" return "none"
default: default:
return "invalid" return "invalid"
} }

2
test/e2e/libpod_suite_test.go
View File

@ -74,7 +74,7 @@ func (p *PodmanTestIntegration) makeOptions(args []string, noEvents bool) []stri
eventsType := "file" eventsType := "file"
if noEvents { if noEvents {
eventsType = "null" eventsType = "none"
} }
podmanOptions := strings.Split(fmt.Sprintf("%s--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s --tmpdir %s --events-backend %s", podmanOptions := strings.Split(fmt.Sprintf("%s--root %s --runroot %s --runtime %s --conmon %s --cni-config-dir %s --cgroup-manager %s --tmpdir %s --events-backend %s",