summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-23 20:12:29 +0000
committerGitHub <noreply@github.com>2020-09-23 20:12:29 +0000
commita6b300ef7ee19da0c590af9bbcd1a35de7fa8c84 (patch)
tree04dc36b0fd56f4b82e936ad7a9376c1bd084d595
parent81c543bbe3cd5130b5a2f163011d59d8b09f6877 (diff)
parentbbbc0655b970e93149e866cd9c025040e1e5c33b (diff)
downloadpodman-a6b300ef7ee19da0c590af9bbcd1a35de7fa8c84.tar.gz
podman-a6b300ef7ee19da0c590af9bbcd1a35de7fa8c84.tar.bz2
podman-a6b300ef7ee19da0c590af9bbcd1a35de7fa8c84.zip
Merge pull request #7754 from mheon/fix_logdriver_order
Fix a bug where log-driver json-file was made no logs
-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())