mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2024-11-23 02:11:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #160 from gonzojive/master

Browse source 
Improve error messages in template parsing init().
This commit is contained in:
Brad Rydzewski 2014-03-04 10:22:35 -08:00
commit df25a380ba
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkg/template/template.go
View file

@ -2,6 +2,7 @@ package template
import (
"errors"
"fmt"
"html/template"
"io"
@ -109,7 +110,16 @@ func init() {
}
// parse the template and then add to the global map
registry[file] = template.Must(template.Must(template.New("_").Parse(baseTemplate)).Parse(page))
baseParsed, err := template.New("_").Parse(baseTemplate)
if err != nil {
panic(fmt.Errorf("Error parsing base.html template: %s", err))
}
pageParsed, err := baseParsed.Parse(page)
if err != nil {
panic(fmt.Errorf("Error parsing page template for %s: %s", file, err))
}
registry[file] = pageParsed
}
// location of templates
@ -136,8 +146,16 @@ func init() {
if err != nil {
panic(err)
}
baseParsed, err := template.New("_").Parse(base)
if err != nil {
panic(fmt.Errorf("Error parsing base_email.html template: %s", err))
}
emailParsed, err := baseParsed.Parse(email)
if err != nil {
panic(fmt.Errorf("Error parsing email template for %s: %s", file, err))
}
// parse the template and then add to the global map
registry[file] = template.Must(template.Must(template.New("_").Parse(base)).Parse(email))
registry[file] = emailParsed
}
}