peter/ekster
1
0
Fork 0
Code Issues 3 Pull Requests Projects 3 Releases 1 Wiki Activity

Extract template loading

Browse Source
This commit is contained in:
Peter Stuifzand 2018-07-12 20:51:47 +02:00
parent 076a0faea3
commit 0f9752452d
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
cmd/eksterd/main.go
View File

@ -53,7 +53,8 @@ func init() {
} }
type mainHandler struct { type mainHandler struct {
Backend *memoryBackend Backend *memoryBackend
Templates *template.Template
} }
type session struct { type session struct {
@ -76,6 +77,19 @@ type settingsPage struct {
Session session Session session
} }
func newMainHandler(backend *memoryBackend) (*mainHandler, error) {
h := &mainHandler{Backend: backend}
templates, err := template.ParseGlob("*.html")
if err != nil {
return nil, err
}
h.Templates = templates
return h, nil
}
func (h *mainHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { func (h *mainHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
conn := pool.Get() conn := pool.Get()
defer conn.Close() defer conn.Close()
@ -117,18 +131,10 @@ func (h *mainHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
t, err := template.ParseFiles(
os.Getenv("EKSTER_TEMPLATES") + "/index.html",
)
if err != nil {
fmt.Fprintf(w, "ERROR: %q\n", err)
return
}
var page indexPage var page indexPage
page.Session = sess page.Session = sess
err = t.ExecuteTemplate(w, "index.html", page) err = h.Templates.ExecuteTemplate(w, "index.html", page)
if err != nil { if err != nil {
fmt.Fprintf(w, "ERROR: %q\n", err) fmt.Fprintf(w, "ERROR: %q\n", err)
return return
@ -226,18 +232,10 @@ func (h *mainHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
t, err := template.ParseFiles(
os.Getenv("EKSTER_TEMPLATES") + "/settings.html",
)
if err != nil {
fmt.Fprintf(w, "ERROR: %q\n", err)
return
}
var page settingsPage var page settingsPage
page.Session = sess page.Session = sess
err = t.ExecuteTemplate(w, "settings.html", page) err = h.Templates.ExecuteTemplate(w, "settings.html", page)
if err != nil { if err != nil {
fmt.Fprintf(w, "ERROR: %q\n", err) fmt.Fprintf(w, "ERROR: %q\n", err)
return return
@ -372,10 +370,11 @@ func main() {
http.Handle("/incoming/", &incomingHandler{ http.Handle("/incoming/", &incomingHandler{
Backend: &hubBackend, Backend: &hubBackend,
}) })
handler, err := newMainHandler(backend.(*memoryBackend))
http.Handle("/", &mainHandler{ if err != nil {
Backend: backend.(*memoryBackend), log.Fatal(err)
}) }
http.Handle("/", handler)
backend.(*memoryBackend).run() backend.(*memoryBackend).run()
hubBackend.run() hubBackend.run()