refactor(tpl): refine template initializing

Author: marjune163

src/tpl/page.html.go

@@ -68,33 +68,33 @@ const pageTplStr = `
 </html>
 `
 
-var defaultPage *template.Template
+var defaultPageTpl *template.Template
 
 func init() {
-	tplObj := template.New("page")
-	tplObj = addFuncMap(tplObj)
+	pageTpl := template.New("page")
+	pageTpl = addFuncMap(pageTpl)
 
 	var err error
-	defaultPage, err = tplObj.Parse(pageTplStr)
+	defaultPageTpl, err = pageTpl.Parse(pageTplStr)
 	if serverErrHandler.CheckError(err) {
-		defaultPage = template.Must(tplObj.Parse("Builtin Template Error"))
+		defaultPageTpl = template.Must(pageTpl.Parse("Builtin Template Error"))
 	}
 }
 
 func LoadPage(tplPath string) (*template.Template, error) {
-	var tplObj *template.Template
-	var err error
-
-	if len(tplPath) > 0 {
-		tplObj = template.New(path.Base(tplPath))
-		tplObj = addFuncMap(tplObj)
-		tplObj, err = tplObj.ParseFiles(tplPath)
+	if len(tplPath) == 0 {
+		return defaultPageTpl, nil
 	}
-	if err != nil || len(tplPath) == 0 {
-		tplObj = defaultPage
+
+	var err error
+	pageTpl := template.New(path.Base(tplPath))
+	pageTpl = addFuncMap(pageTpl)
+	pageTpl, err = pageTpl.ParseFiles(tplPath)
+	if err != nil {
+		pageTpl = defaultPageTpl
 	}
 
-	return tplObj, err
+	return pageTpl, err
 }
 
 func addFuncMap(tpl *template.Template) *template.Template {

src/vhostMux/main.go

@@ -43,7 +43,7 @@ func NewServeMux(
 	}
 
 	// template
-	tplObj, err := tpl.LoadPage(p.Template)
+	pageTpl, err := tpl.LoadPage(p.Template)
 	errorHandler.LogError(err)
 
 	// register handlers
@@ -58,7 +58,7 @@ func NewServeMux(
 	handlers := map[string]http.Handler{}
 	for urlPath, fsPath := range aliases {
 		emptyHandlerRoot := emptyRoot && urlPath == "/"
-		handlers[urlPath] = serverHandler.NewHandler(fsPath, emptyHandlerRoot, urlPath, p, users, tplObj, logger, errorHandler)
+		handlers[urlPath] = serverHandler.NewHandler(fsPath, emptyHandlerRoot, urlPath, p, users, pageTpl, logger, errorHandler)
 	}
 
 	// create ServeMux