opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-26 09:58:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request from mheon/fix_logdriver_order

Browse Source 
Fix a bug where log-driver json-file was made no logs
This commit is contained in:
OpenShift Merge Robot
2020-09-23 20:12:29 +00:00
committed by GitHub
parent 81c543bbe3 bbbc0655b9
commit a6b300ef7e
1 changed files with 2 additions and 2 deletions

4
libpod/oci_conmon_linux.go

@ -1330,10 +1330,10 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p
switch logDriver { switch logDriver {
case define.JournaldLogging: case define.JournaldLogging:
logDriverArg = define.JournaldLogging logDriverArg = define.JournaldLogging
case define.JSONLogging:
fallthrough
case define.NoLogging: case define.NoLogging:
logDriverArg = define.NoLogging logDriverArg = define.NoLogging
case define.JSONLogging:
fallthrough
default: //nolint-stylecheck default: //nolint-stylecheck
// No case here should happen except JSONLogging, but keep this here in case the options are extended // 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()) logrus.Errorf("%s logging specified but not supported. Choosing k8s-file logging instead", ctr.LogDriver())