summaryrefslogtreecommitdiff
path: root/libpod/oci_conmon_linux.go
diff options
context:
space:
mode:
authorMatthew Heon <mheon@redhat.com>2020-09-23 13:25:30 -0400
committerMatthew Heon <mheon@redhat.com>2020-09-23 13:28:55 -0400
commitbbbc0655b970e93149e866cd9c025040e1e5c33b (patch)
tree0d554309a7178d64b4d5dc74e5525f7b4aa5e98c /libpod/oci_conmon_linux.go
parent4e4c9056e0c044b95bfd808a5afd0fd64f4fa9fc (diff)
downloadpodman-bbbc0655b970e93149e866cd9c025040e1e5c33b.tar.gz
podman-bbbc0655b970e93149e866cd9c025040e1e5c33b.tar.bz2
podman-bbbc0655b970e93149e866cd9c025040e1e5c33b.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>
Diffstat (limited to 'libpod/oci_conmon_linux.go')
-rw-r--r--libpod/oci_conmon_linux.go4
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())