Merge pull request #42044 from nathanlcarlson/labels_regex_length_check

thaJeztah · web-flow · commit 34ed21a7f8c0 · 2021-02-18T22:22:44.000+01:00
Check the length of the correct variable #42039
Upstream-commit: 8b6d9eaa5552f6b4a21e1aed90369fed45361d25
Component: engine
diff --git a/components/engine/daemon/logger/loginfo.go b/components/engine/daemon/logger/loginfo.go
@@ -42,7 +42,7 @@ func (info *Info) ExtraAttributes(keyMod func(string) string) (map[string]string
 	}
 
 	labelsRegex, ok := info.Config["labels-regex"]
-	if ok && len(labels) > 0 {
+	if ok && len(labelsRegex) > 0 {
 		re, err := regexp.Compile(labelsRegex)
 		if err != nil {
 			return nil, err

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ func (info *Info) ExtraAttributes(keyMod func(string) string) (map[string]string`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`labelsRegex, ok := info.Config["labels-regex"]`
`45`		`- if ok && len(labels) > 0 {`
	`45`	`+ if ok && len(labelsRegex) > 0 {`
`46`	`46`	`re, err := regexp.Compile(labelsRegex)`
`47`	`47`	`if err != nil {`
`48`	`48`	`return nil, err`