opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-05-21 17:16:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug where log-driver json-file was made no logs

Browse Source 
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>
This commit is contained in:
Matthew Heon
2020-09-23 13:25:30 -04:00
parent 4e4c9056e0
commit bbbc0655b9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libpod/oci_conmon_linux.go
View File

@ -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())