From faa296075f5ea2d8e01004b46b036997f9529d99 Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Sun, 26 May 2024 22:06:44 +0200 Subject: Clean out Get/SetRequestLogger from apiutil --- src/http/http.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/http/http.go') diff --git a/src/http/http.go b/src/http/http.go index 4403a69..11b4976 100644 --- a/src/http/http.go +++ b/src/http/http.go @@ -209,8 +209,9 @@ func (a *api) blogHandler() http.Handler { mux.Handle("/drafts/", http.StripPrefix("/drafts", // everything to do with drafts is protected - authMiddleware(a.auther)( - + authMiddleware( + a.params.Logger.WithNamespace("drafts-auther"), a.auther, + )( apiutil.MethodMux(map[string]http.Handler{ "EDIT": a.editPostHandler(true), "MANAGE": a.manageDraftPostsHandler(), @@ -228,13 +229,13 @@ func (a *api) blogHandler() http.Handler { mux.Handle("/", a.renderIndexHandler()) readOnlyMiddlewares := []middleware{ - logReqMiddleware, // only log GETs on cache miss + logReqMiddleware(a.params.Logger), // only log GETs on cache miss cacheMiddleware(a.params.Cache, a.params.PublicURL), } readWriteMiddlewares := []middleware{ - purgeCacheOnOKMiddleware(a.params.Cache), - authMiddleware(a.auther), + purgeCacheOnOKMiddleware(a.params.Logger, a.params.Cache), + authMiddleware(a.params.Logger.WithNamespace("rw-auther"), a.auther), } h := apiutil.MethodMux(map[string]http.Handler{ @@ -270,7 +271,7 @@ func (a *api) handler() http.Handler { noCacheMiddleware, ), }), - setLoggerMiddleware(a.params.Logger), + setLogCtxMiddleware(), ) return h -- cgit v1.2.3