Skip to content

Commit

Permalink
Merge pull request containers#3707 from haircommander/no-errorf
Browse files Browse the repository at this point in the history
Add handling for empty LogDriver
  • Loading branch information
openshift-merge-robot committed Aug 2, 2019
2 parents 3cc9ab8 + 2110422 commit 140e08e
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions libpod/oci_internal_linux.go
Expand Up @@ -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)
}
Expand Down

0 comments on commit 140e08e

Please sign in to comment.