go/sftpgo
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2025-11-29 22:08:10 +02:00
Code Issues Releases Activity

updated utils.LoadTemplate() to call template.ParseFiles() directly and added a way to specify a base template (will be used in the next commit)

Browse Source
This commit is contained in:
Manuel Reithuber
2021-06-05 18:06:53 +02:00
committed by Nicola Murino
parent c07dc74d48
commit 88b10da596
3 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
utils/utils.go
View File

@@ -353,9 +353,22 @@ func CleanPath(p string) string {
return path.Clean(p)
}
// LoadTemplate wraps a call to a function returning (*Template, error)
// it is just like template.Must but it writes a log before exiting
func LoadTemplate(t *template.Template, err error) *template.Template {
// LoadTemplate parses the given template paths.
// it behaves like template.Must but it writes a log before exiting
// you can optionally provide a base template (e.g. to define some custom functions)
func LoadTemplate(base *template.Template, paths ...string) *template.Template {
var t *template.Template
var err error
if base != nil {
t, err = base.ParseFiles(paths...)
if err == nil {
t, err = t.Clone()
}
} else {
t, err = template.ParseFiles(paths...)
}
if err != nil {
logger.ErrorToConsole("error loading required template: %v", err)
logger.Error(logSender, "", "error loading required template: %v", err)