RepoMirrors
/
alertmanager
mirror of https://github.com/prometheus/alertmanager
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #185 from prometheus/tmpl1 

Allow zero matching template files
This commit is contained in:
Brian Brazil 2015-12-09 13:59:32 +00:00
parent f8fdb24fb2 76f884b328
commit d059dca7c2
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
template/template.go
View File

@ -16,6 +16,7 @@ package template
import (
"bytes"
"net/url"
"path/filepath"
"sort"
"strings"
@ -60,11 +61,19 @@ func FromGlobs(paths ...string) (*Template, error) {
}
for _, tp := range paths {
if t.text, err = t.text.ParseGlob(tp); err != nil {
// ParseGlob in the template packages errors if not at least one file is
// matched. We want to allow empty matches that may be populated later on.
p, err := filepath.Glob(tp)
if err != nil {
return nil, err
}
if t.html, err = t.html.ParseGlob(tp); err != nil {
return nil, err
if len(p) > 0 {
if t.text, err = t.text.ParseGlob(tp); err != nil {
return nil, err
}
if t.html, err = t.html.ParseGlob(tp); err != nil {
return nil, err
}
}
}
return t, nil