diff options
| author | Michael Matloob <matloob@golang.org> | 2023-07-31 19:07:21 -0400 |
|---|---|---|
| committer | Michael Matloob <matloob@golang.org> | 2023-08-04 20:52:42 +0000 |
| commit | 9e6bdc9d522da9b09475342d9d7629daae359042 (patch) | |
| tree | 77c272ac93e0bfd35698ef46952670a35fd8f303 /internal/frontend/server.go | |
| parent | 051a825d5ae1981874f79fb4d5bb32c1ae6696ba (diff) | |
| download | go-x-pkgsite-9e6bdc9d522da9b09475342d9d7629daae359042.tar.xz | |
internal/middleware: move stats to its own package
Make a package internal/middleware/stats for middleware.Stats and
middleware.ElapsedStat. This is part of removing the dependency from
internal/frontend on internal/middleware.
For golang/go#61399
Change-Id: I44afbfc9b9e28e1caabab8fe700376ec026c863d
Reviewed-on: https://go-review.googlesource.com/c/pkgsite/+/514521
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: Michael Matloob <matloob@golang.org>
Reviewed-by: Jamal Carvalho <jamal@golang.org>
kokoro-CI: kokoro <noreply+kokoro@google.com>
Diffstat (limited to 'internal/frontend/server.go')
| -rw-r--r-- | internal/frontend/server.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/internal/frontend/server.go b/internal/frontend/server.go index 4ec4ca50..7fcdf40f 100644 --- a/internal/frontend/server.go +++ b/internal/frontend/server.go @@ -32,7 +32,7 @@ import ( "golang.org/x/pkgsite/internal/licenses" "golang.org/x/pkgsite/internal/log" "golang.org/x/pkgsite/internal/memory" - "golang.org/x/pkgsite/internal/middleware" + "golang.org/x/pkgsite/internal/middleware/stats" "golang.org/x/pkgsite/internal/queue" "golang.org/x/pkgsite/internal/static" "golang.org/x/pkgsite/internal/version" @@ -198,9 +198,9 @@ func (s *Server) Install(handle func(string, http.Handler), cacher Cacher, authV handle("/", detailHandler) if s.serveStats { handle("/detail-stats/", - middleware.Stats()(http.StripPrefix("/detail-stats", s.errorHandler(s.serveDetails)))) + stats.Stats()(http.StripPrefix("/detail-stats", s.errorHandler(s.serveDetails)))) handle("/search-stats/", - middleware.Stats()(http.StripPrefix("/search-stats", s.errorHandler(s.serveSearch)))) + stats.Stats()(http.StripPrefix("/search-stats", s.errorHandler(s.serveSearch)))) } handle("/robots.txt", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { w.Header().Set("Content-Type", "text/plain; charset=utf-8") @@ -672,7 +672,7 @@ func (s *Server) renderErrorPage(ctx context.Context, status int, templateName s // servePage is used to execute all templates for a *Server. func (s *Server) servePage(ctx context.Context, w http.ResponseWriter, templateName string, page any) { - defer middleware.ElapsedStat(ctx, "servePage")() + defer stats.Elapsed(ctx, "servePage")() buf, err := s.renderPage(ctx, templateName, page) if err != nil { @@ -688,7 +688,7 @@ func (s *Server) servePage(ctx context.Context, w http.ResponseWriter, templateN // renderPage executes the given templateName with page. func (s *Server) renderPage(ctx context.Context, templateName string, page any) ([]byte, error) { - defer middleware.ElapsedStat(ctx, "renderPage")() + defer stats.Elapsed(ctx, "renderPage")() tmpl, err := s.findTemplate(templateName) if err != nil { |