Simplify error handling during startup

This commit is contained in:
bronku 2025-03-23 21:58:34 +01:00
parent 969dbfb1aa
commit 4b2fcbc58a
5 changed files with 29 additions and 54 deletions

View file

@ -19,15 +19,6 @@ func (h *Server) Close() {
}
}
func (h *Server) openStore() error {
var err error
h.s, err = store.OpenStore("./foo.db")
if err != nil {
h.s.Close()
}
return err
}
func (h *Server) loadHandler() {
mux := http.NewServeMux()
@ -38,21 +29,12 @@ func (h *Server) loadHandler() {
h.Handler = mux
}
func New() (*Server, error) {
func New() *Server {
var server Server
var err error
err = server.loadTemplates()
if err != nil {
return nil, err
}
err = server.openStore()
if err != nil {
return nil, err
}
server.loadTemplates()
server.s = store.OpenStore("./foo.db")
server.loadHandler()
return &server, nil
return &server
}

View file

@ -3,16 +3,19 @@ package server
import (
"embed"
"html/template"
"log"
"net/http"
)
//go:embed templates/*
var templates embed.FS
func (h *Server) loadTemplates() error {
func (h *Server) loadTemplates() {
var err error
h.tmpl, err = template.ParseFS(templates, "templates/*")
return err
if err != nil {
log.Fatal(err)
}
}
func (s *Server) render(fetch fetcher, templateName string) http.HandlerFunc {