diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-03 00:50:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-03 00:50:36 +0200 |
| commit | 140e08ef64591ecbce11ba8fff94afa8e5e65eeb (patch) | |
| tree | 9c676b4ba260dc93e53577fd8a01fdc933600296 | |
| parent | 3cc9ab8992833ddf952df479ffb239c61845fa2e (diff) | |
| parent | 2110422a61fdcf0317ed1b0a02dc1b184392f713 (diff) | |
| download | podman-140e08ef64591ecbce11ba8fff94afa8e5e65eeb.tar.gz podman-140e08ef64591ecbce11ba8fff94afa8e5e65eeb.tar.bz2 podman-140e08ef64591ecbce11ba8fff94afa8e5e65eeb.zip | |
Merge pull request #3707 from haircommander/no-errorf
Add handling for empty LogDriver
| -rw-r--r-- | libpod/oci_internal_linux.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libpod/oci_internal_linux.go b/libpod/oci_internal_linux.go index 0bcd021db..52cebefab 100644 --- a/libpod/oci_internal_linux.go +++ b/libpod/oci_internal_linux.go @@ -278,6 +278,10 @@ func (r *OCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, pidPath // 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()) fallthrough + case "": + // to get here, either a user would specify `--log-driver ""`, or this came from another place in libpod + // since the former case is obscure, and the latter case isn't an error, let's silently fallthrough + fallthrough case KubernetesLogging: logDriver = fmt.Sprintf("%s:%s", KubernetesLogging, logPath) } |