all repos — homestead @ a55d2572dcddd4cdf6326783b38bfd10e955c790

Code for my website

enable filtered debug logging via DEBUG="component.*"

Alan Pearce
commit

a55d2572dcddd4cdf6326783b38bfd10e955c790

parent

b5874da4f507580ebfd739d8f8dbe52bcdbfdd55

1 file changed, 7 insertions(+), 5 deletions(-)

changed files
M internal/website/mux.gointernal/website/mux.go
@@ -31,12 +31,14 @@
type WrappedWebHandler struct { config *config.Config handler webHandler + log *log.Logger } -func wrapHandler(cfg *config.Config, webHandler webHandler) WrappedWebHandler { +func wrapHandler(cfg *config.Config, webHandler webHandler, log *log.Logger) WrappedWebHandler { return WrappedWebHandler{ config: cfg, handler: webHandler, + log: log, } }
@@ -44,7 +46,7 @@ func (fn WrappedWebHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
defer func() { if fail := recover(); fail != nil { w.WriteHeader(http.StatusInternalServerError) - log.Error("runtime panic!", "error", fail) + fn.log.Error("runtime panic!", "error", fail) } }() if err := fn.handler(w, r); err != nil {
@@ -60,11 +62,11 @@ }
} } -func NewMux(cfg *config.Config, root string) (mux *http.ServeMux, err error) { +func NewMux(cfg *config.Config, root string, log *log.Logger) (mux *http.ServeMux, err error) { mux = &http.ServeMux{} log.Debug("registering content files", "root", root) - err = registerContentFiles(root) + err = registerContentFiles(root, log) if err != nil { return nil, errors.WithMessagef(err, "registering content files") }
@@ -99,7 +101,7 @@ }
http.ServeFile(w, r, files[urlPath].alternatives[enc]) return nil - })) + }, log)) var acctResource = "acct:" + cfg.Email me := digit.NewResource(acctResource).