diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-16 10:52:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-16 10:52:58 -0700 |
| commit | 5def21140038fc34cee9707d3069bf52adc24577 (patch) | |
| tree | 2582da76814b9eb636f11070b00a2dbb596754a5 /libpod/oci_conmon_linux.go | |
| parent | 8c4d4b58eee5e6d759199c36560af738aadc521d (diff) | |
| parent | ba430bfe5ef65d5aa5ffa1fef0087da76aafcc35 (diff) | |
| download | podman-5def21140038fc34cee9707d3069bf52adc24577.tar.gz podman-5def21140038fc34cee9707d3069bf52adc24577.tar.bz2 podman-5def21140038fc34cee9707d3069bf52adc24577.zip | |
Merge pull request #5842 from baude/v2bloat2
podman v2 remove bloat v2
Diffstat (limited to 'libpod/oci_conmon_linux.go')
| -rw-r--r-- | libpod/oci_conmon_linux.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libpod/oci_conmon_linux.go b/libpod/oci_conmon_linux.go index 0113f7d8e..da4b85067 100644 --- a/libpod/oci_conmon_linux.go +++ b/libpod/oci_conmon_linux.go @@ -1427,9 +1427,9 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p var logDriver string switch ctr.LogDriver() { - case JournaldLogging: - logDriver = JournaldLogging - case JSONLogging: + case define.JournaldLogging: + logDriver = define.JournaldLogging + case define.JSONLogging: fallthrough default: //nolint-stylecheck // No case here should happen except JSONLogging, but keep this here in case the options are extended @@ -1439,8 +1439,8 @@ func (r *ConmonOCIRuntime) sharedConmonArgs(ctr *Container, cuuid, bundlePath, p // 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) + case define.KubernetesLogging: + logDriver = fmt.Sprintf("%s:%s", define.KubernetesLogging, logPath) } args = append(args, "-l", logDriver) |