diff options
| author | Matthew Heon <matthew.heon@pm.me> | 2019-08-01 14:57:29 -0400 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2019-08-01 15:01:54 -0400 |
| commit | 8da24f2f7d3472d2be4ccde8e7b42790671d464f (patch) | |
| tree | 98e4e0eb9b594e9279ea973587524148360a9dfc | |
| parent | 6bbeda6da5f1facef226125b2089d8f1712208c8 (diff) | |
| download | podman-8da24f2f7d3472d2be4ccde8e7b42790671d464f.tar.gz podman-8da24f2f7d3472d2be4ccde8e7b42790671d464f.tar.bz2 podman-8da24f2f7d3472d2be4ccde8e7b42790671d464f.zip | |
Use "none" instead of "null" for the null eventer
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
| -rw-r--r-- | docs/libpod.conf.5.md | 2 | ||||
| -rw-r--r-- | docs/podman.1.md | 4 | ||||
| -rw-r--r-- | libpod/events/events.go | 2 | ||||
| -rw-r--r-- | test/e2e/libpod_suite_test.go | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/docs/libpod.conf.5.md b/docs/libpod.conf.5.md index 0bdba4593..4240ae15a 100644 --- a/docs/libpod.conf.5.md +++ b/docs/libpod.conf.5.md @@ -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. **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**="" Keys sequence used for detaching a container diff --git a/docs/podman.1.md b/docs/podman.1.md index 7aa15019a..bfb5a9aec 100644 --- a/docs/podman.1.md +++ b/docs/podman.1.md @@ -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 -**--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* diff --git a/libpod/events/events.go b/libpod/events/events.go index a80e97e90..5e828bc8a 100644 --- a/libpod/events/events.go +++ b/libpod/events/events.go @@ -22,7 +22,7 @@ func (et EventerType) String() string { case Journald: return "journald" case Null: - return "null" + return "none" default: return "invalid" } diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 841c8a9ca..1df59dbe3 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -74,7 +74,7 @@ func (p *PodmanTestIntegration) makeOptions(args []string, noEvents bool) []stri eventsType := "file" 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", |