mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-02-02 08:31:11 -08:00
Code Issues Actions 55 Packages Projects Releases Wiki Activity

fix bug missing an error. (#7020)

Browse source 
Signed-off-by: johncming <johncming@yahoo.com>
This commit is contained in:
johncming 2020-03-21 20:05:19 +08:00 committed by GitHub
parent bdc45c2b9e
commit 51c824543b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkg/rulefmt/rulefmt.go
View file

@ -264,12 +264,22 @@ func Parse(content []byte) (*RuleGroups, []error) {
var ( var (
groups RuleGroups groups RuleGroups
node ruleGroups node ruleGroups
errs []error
) )
err := yaml.Unmarshal(content, &groups) err := yaml.Unmarshal(content, &groups)
_err := yaml.Unmarshal(content, &node) if err != nil {
if err != nil || _err != nil { errs = append(errs, err)
return nil, []error{err}
} }
err = yaml.Unmarshal(content, &node)
if err != nil {
errs = append(errs, err)
}
if len(errs) > 0 {
return nil, errs
}
return &groups, groups.Validate(node) return &groups, groups.Validate(node)
} }