kyle/kls
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused template init (fix startup crash)

Browse Source 
The global template.Must parse at init time was left over from the
basic auth version. web.RenderTemplate handles parsing per-request.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Kyle Isom
2026-03-28 18:15:46 -07:00
parent 9db3883706
commit 131924520d
1 changed files with 0 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
handler.go
View File

@@ -4,9 +4,6 @@ import (
"context" "context"
"database/sql" "database/sql"
"embed" "embed"
"fmt"
"html/template"
"log"
"net/http" "net/http"
"strings" "strings"
@@ -29,33 +26,12 @@ var templateFiles embed.FS
//go:embed static //go:embed static
var staticFiles embed.FS var staticFiles embed.FS
var templates = template.Must(template.ParseFS(templateFiles, "templates/*.html"))
type page struct { type page struct {
Username string Username string
Short string Short string
URLs []*links.URL URLs []*links.URL
} }
func (srv *server) servePage(w http.ResponseWriter, p page, tpl string, funcs ...template.FuncMap) {
t := templates
if len(funcs) > 0 {
t = template.Must(t.Clone())
for _, fm := range funcs {
t.Funcs(fm)
}
// Re-parse to pick up the funcs.
t = template.Must(template.New("").Funcs(funcs[0]).ParseFS(templateFiles, "templates/*.html"))
}
err := t.ExecuteTemplate(w, tpl, p)
if err != nil {
log.Printf("error executing template: %s", err)
http.Error(w, fmt.Sprintf("template execution failed: %s", err.Error()),
http.StatusInternalServerError)
return
}
}
func (srv *server) handleLoginPage(w http.ResponseWriter, r *http.Request) { func (srv *server) handleLoginPage(w http.ResponseWriter, r *http.Request) {
web.RenderTemplate(w, templateFiles, "login.html", page{}, srv.csrf.TemplateFunc(w)) web.RenderTemplate(w, templateFiles, "login.html", page{}, srv.csrf.TemplateFunc(w))
} }