diff options
| author | Matthew Heon <mheon@redhat.com> | 2020-09-23 13:25:30 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2020-09-25 11:03:31 -0400 |
| commit | f96db0501bfecd611869f047d4a470452b64605b (patch) | |
| tree | 39453ab298288100877b6d356516581a2ae2bbc3 | |
| parent | 8252fd24c1f71e3c87f84fdf12474629d939ce34 (diff) | |
| download | podman-f96db0501bfecd611869f047d4a470452b64605b.tar.gz podman-f96db0501bfecd611869f047d4a470452b64605b.tar.bz2 podman-f96db0501bfecd611869f047d4a470452b64605b.zip | |
Fix a bug where log-driver json-file was made no logs
When we added the None log driver, it was accidentally added in
the middle of a set of Fallthrough stanzas which all should have
led to k8s-file, so that JSON file logging accidentally caused
no logging to be selected instead of k8s-file.
Signed-off-by: Matthew Heon <mheon@redhat.com>
| -rw-r--r-- | libpod/oci_conmon_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 5769e5580..e3f2d6403 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1330,10 +1330,10 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p switch logDriver { case define.JournaldLogging: logDriverArg = define.JournaldLogging - case define.JSONLogging: - fallthrough case define.NoLogging: logDriverArg = define.NoLogging + case define.JSONLogging: + fallthrough default: //nolint-stylecheck // No case here should happen except JSONLogging, but keep this here in case the options are extended logrus.Errorf("%s logging specified but not supported. Choosing k8s-file logging instead", ctr.LogDriver()) |