all repos — homestead @ 5f2f546708cbe89a75131797b9f6d7f274656c43

Code for my website

ensure http always has a logger

Alan Pearce
commit

5f2f546708cbe89a75131797b9f6d7f274656c43

parent

52c7a311770809e20c790078ddf27ea4fa10c77e

4 files changed, 5 insertions(+), 11 deletions(-)

changed files
M domain/content/publisher/app.godomain/content/publisher/app.go
@@ -56,7 +56,7 @@ if err != nil {
return nil, fault.Wrap(err, fmsg.With("invalid base URL")) } - mux := ihttp.NewServeMux() + mux := ihttp.NewServeMux(log.Named("http")) mux.HandleFunc("/", app.WithUserContext(app.Index)) mux.HandleFunc("/style.css", app.Style)
M domain/web/mux.godomain/web/mux.go
@@ -79,7 +79,7 @@ return nil
} func (website *Website) MakeRedirectorApp() *server.App { - mux := ihttp.NewServeMux() + mux := ihttp.NewServeMux(website.log.Named("http")) website.identity.RegisterHandlers(mux) re := regexp.MustCompile(
M domain/web/website.godomain/web/website.go
@@ -182,7 +182,7 @@ <-firstUpdate
website.identity = identity.New(cfg, log.Named("identity")) - mux := ihttp.NewServeMux() + mux := ihttp.NewServeMux(log.Named("http")) mux.HandleError(website.ErrorHandler) mux.Handle("/", website) mux.HandleFunc("/calendar", website.Calendar)
M shared/http/mux.goshared/http/mux.go
@@ -27,20 +27,14 @@ *http.ServeMux
} // NewServeMux creates a new ServeMux with a default error handler. -func NewServeMux() *ServeMux { +func NewServeMux(logger *log.Logger) *ServeMux { return &ServeMux{ ServeMux: http.NewServeMux(), + log: logger, errorHandler: func(err Error, w http.ResponseWriter, _ *http.Request) { http.Error(w, err.Error(), err.StatusCode()) }, } -} - -// WithLogger sets the logger for this ServeMux and returns the ServeMux. -func (sm *ServeMux) WithLogger(logger *log.Logger) *ServeMux { - sm.log = logger - - return sm } // Handle registers the handler for the given pattern.