diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-10 23:55:45 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-10 23:55:45 +0100 |
| commit | 0e9c208d3f9fc6f160f7e7746119ddf99ae6f220 (patch) | |
| tree | 858cfc2d1b6867ee9c81b6897f5ce802811a8fc4 /pkg/spec/parse.go | |
| parent | 40a16ee4c36aa143d3b27da9189d16afce35740d (diff) | |
| parent | 4726eb2861e72a079ed337371182226a666c541a (diff) | |
| download | podman-0e9c208d3f9fc6f160f7e7746119ddf99ae6f220.tar.gz podman-0e9c208d3f9fc6f160f7e7746119ddf99ae6f220.tar.bz2 podman-0e9c208d3f9fc6f160f7e7746119ddf99ae6f220.zip | |
Merge pull request #4805 from giuseppe/log-tag
log: support --log-opt tag=
Diffstat (limited to 'pkg/spec/parse.go')
| -rw-r--r-- | pkg/spec/parse.go | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/pkg/spec/parse.go b/pkg/spec/parse.go index c2572a033..6fa0b0636 100644 --- a/pkg/spec/parse.go +++ b/pkg/spec/parse.go @@ -132,16 +132,23 @@ func validateIOpsDevice(val string) (*throttleDevice, error) { //nolint }, nil } -func getLoggingPath(opts []string) string { +// getLoggingOpts splits the path= and tag= options provided to --log-opt. +func getLoggingOpts(opts []string) (string, string) { + var path, tag string for _, opt := range opts { arr := strings.SplitN(opt, "=", 2) if len(arr) == 2 { if strings.TrimSpace(arr[0]) == "path" { - return strings.TrimSpace(arr[1]) + path = strings.TrimSpace(arr[1]) + } else if strings.TrimSpace(arr[0]) == "tag" { + tag = strings.TrimSpace(arr[1]) } } + if path != "" && tag != "" { + break + } } - return "" + return path, tag } // ParseDevice parses device mapping string to a src, dest & permissions string |