oss/miniflux-v2
oss/miniflux-v2
1
0
Fork 0
mirror of https://github.com/miniflux/v2.git synced 2025-08-01 17:38:37 +00:00
Code Wiki Activity

Remove dependency to go-server-timing

Browse source 
fix #1586
This commit is contained in:
Romain de Laage 2022-10-14 17:59:08 +02:00 • committed by Frédéric Guillot
parent 74b69a4c7c
commit ec47106c26
4 changed files with 20 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ui/ui.go
View file

@ -7,14 +7,12 @@ package ui // import "miniflux.app/ui"
import (
"net/http"
"miniflux.app/config"
"miniflux.app/logger"
"miniflux.app/storage"
"miniflux.app/template"
"miniflux.app/worker"
"github.com/gorilla/mux"
servertiming "github.com/mitchellh/go-server-timing"
)
// Serve declares all routes for the user interface.
@ -31,9 +29,6 @@ func Serve(router *mux.Router, store *storage.Storage, pool *worker.Pool) {
uiRouter := router.NewRoute().Subrouter()
uiRouter.Use(middleware.handleUserSession)
uiRouter.Use(middleware.handleAppSession)
uiRouter.Use(func(h http.Handler) http.Handler {
return servertiming.Middleware(h, &servertiming.MiddlewareOpts{DisableHeaders: !config.Opts.HasServerTimingHeader()})
})
uiRouter.StrictSlash(true)
// Static assets.

31
ui/unread_entries.go
View file

@ -5,21 +5,21 @@
package ui // import "miniflux.app/ui"
import (
"fmt"
"net/http"
"time"
"miniflux.app/config"
"miniflux.app/http/request"
"miniflux.app/http/response/html"
"miniflux.app/http/route"
"miniflux.app/model"
"miniflux.app/ui/session"
"miniflux.app/ui/view"
servertiming "github.com/mitchellh/go-server-timing"
)
func (h *handler) showUnreadPage(w http.ResponseWriter, r *http.Request) {
timing := servertiming.FromContext(r.Context())
prep := timing.NewMetric("pre_processing").Start()
beginPreProcessing := time.Now()
sess := session.New(h.store, request.SessionID(r))
view := view.New(h.tpl, r, sess)
@ -30,7 +30,7 @@ func (h *handler) showUnreadPage(w http.ResponseWriter, r *http.Request) {
return
}
m := timing.NewMetric("sql_count_unread_entries").Start()
beginSqlCountUnreadEntries := time.Now()
offset := request.QueryIntParam(r, "offset", 0)
builder := h.store.NewEntryQueryBuilder(user.ID)
builder.WithStatus(model.EntryStatusUnread)
@ -40,13 +40,13 @@ func (h *handler) showUnreadPage(w http.ResponseWriter, r *http.Request) {
html.ServerError(w, r, err)
return
}
m.Stop()
finishSqlCountUnreadEntries := time.Now()
if offset >= countUnread {
offset = 0
}
m = timing.NewMetric("sql_fetch_unread_entries").Start()
beginSqlFetchUnreadEntries := time.Now()
builder = h.store.NewEntryQueryBuilder(user.ID)
builder.WithStatus(model.EntryStatusUnread)
builder.WithOrder(user.EntryOrder)
@ -59,7 +59,7 @@ func (h *handler) showUnreadPage(w http.ResponseWriter, r *http.Request) {
html.ServerError(w, r, err)
return
}
m.Stop()
finishSqlFetchUnreadEntries := time.Now()
view.Set("entries", entries)
view.Set("pagination", getPagination(route.Path(h.router, "unread"), countUnread, offset, user.EntriesPerPage))
@ -69,11 +69,20 @@ func (h *handler) showUnreadPage(w http.ResponseWriter, r *http.Request) {
view.Set("countErrorFeeds", h.store.CountUserFeedsWithErrors(user.ID))
view.Set("hasSaveEntry", h.store.HasSaveEntry(user.ID))
prep.Stop()
finishPreProcessing := time.Now()
m = timing.NewMetric("template_rendering").Start()
beginTemplateRendering := time.Now()
render := view.Render("unread_entries")
m.Stop()
finishTemplateRendering := time.Now()
if config.Opts.HasServerTimingHeader() {
w.Header().Set("Server-Timing", fmt.Sprintf("pre_processing;dur=%d,sql_count_unread_entries;dur=%d,sql_fetch_unread_entries;dur=%d,template_rendering;dur=%d",
finishPreProcessing.Sub(beginPreProcessing).Milliseconds(),
finishSqlCountUnreadEntries.Sub(beginSqlCountUnreadEntries).Milliseconds(),
finishSqlFetchUnreadEntries.Sub(beginSqlFetchUnreadEntries).Milliseconds(),
finishTemplateRendering.Sub(beginTemplateRendering).Milliseconds(),
))
}
html.OK(w, r, render)
}