Open platform to collect and prioritize feedback
performance: some performance improvements based on pprof analysis (#229)
Guilherme Oenning585bfbae8f69
diff --git a/app/middlewares/compress.go b/app/middlewares/compress.goindex 52c076084..9c0649591 100644--- a/app/middlewares/compress.go+++ b/app/middlewares/compress.go@@ -2,10 +2,13 @@ package middlewaresimport ("bufio"+ "bytes""compress/gzip"+ "io/ioutil""net""net/http""strings"+ "sync""github.com/getfider/fider/app/pkg/web")@@ -17,17 +20,23 @@ var (type gzipResponseWriter struct {code intresponse http.ResponseWriter- buffer []byte+ writer *gzip.Writer+ buffer *bytes.Buffer}// Compress returns a middleware which compresses HTTP response using gzip compressionfunc Compress() web.MiddlewareFunc {return func(next web.HandlerFunc) web.HandlerFunc {+ var pool sync.Pool+ pool.New = func() interface{} {+ return gzip.NewWriter(ioutil.Discard)+ }return func(c web.Context) error {res := c.Response- res.Header().Add("Vary", "Accept-Encoding")if strings.Contains(c.Request.Header.Get("Accept-Encoding"), "gzip") {- gzipResponse := &gzipResponseWriter{response: res}+ writer := pool.Get().(*gzip.Writer)+ defer pool.Put(writer)+ gzipResponse := &gzipResponseWriter{response: res, writer: writer, buffer: &bytes.Buffer{}}c.Response = gzipResponsedefer gzipResponse.Flush()}@@ -44,22 +53,21 @@ func (w *gzipResponseWriter) WriteHeader(code int) {}func (w *gzipResponseWriter) Write(b []byte) (int, error) {- w.buffer = append(w.buffer, b...)- return len(b), nil+ return w.buffer.Write(b)}func (w *gzipResponseWriter) Flush() {- if len(w.buffer) >= minSize {+ w.Header().Add("Vary", "Accept-Encoding")+ if w.buffer.Len() >= minSize {w.Header().Del("Content-Length")w.Header().Set("Content-Encoding", "gzip")w.response.WriteHeader(w.code)- gzipWriter := gzip.NewWriter(w.response)- gzipWriter.Write(w.buffer)- gzipWriter.Flush()- gzipWriter.Close()+ w.writer.Reset(w.response)+ w.buffer.WriteTo(w.writer)+ w.writer.Close()} else {w.response.WriteHeader(w.code)- w.response.Write(w.buffer)+ w.buffer.WriteTo(w.response)}}diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex 5beca3380..47fbe458c 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -18,18 +18,37 @@ type Renderer struct {templates map[string]*template.Templatelogger log.Loggersettings *models.AppSettings+ jsBundle string+ cssBundle string}// NewRenderer creates a new Rendererfunc NewRenderer(settings *models.AppSettings, logger log.Logger) *Renderer {- renderer := &Renderer{nil, logger, settings}- renderer.templates = make(map[string]*template.Template)+ renderer := &Renderer{+ templates: make(map[string]*template.Template),+ logger: logger,+ settings: settings,+ }renderer.add("index.html")renderer.add("403.html")renderer.add("404.html")renderer.add("500.html")+ files, _ := ioutil.ReadDir(env.Path("/dist/js"))+ if len(files) > 0 {+ renderer.jsBundle = files[0].Name()+ } else {+ panic("JavaScript Bundle not found.")+ }++ files, _ = ioutil.ReadDir(env.Path("/dist/css"))+ if len(files) > 0 {+ renderer.cssBundle = files[0].Name()+ } else {+ panic("CSS Bundle not found.")+ }+return renderer}@@ -58,6 +77,10 @@ func (r *Renderer) Render(w io.Writer, name string, data interface{}, ctx *Conte}m := data.(Map)+ m["__JavaScriptBundle"] = r.jsBundle+ m["__StyleBundle"] = r.cssBundle+ m["settings"] = r.settings+m["baseUrl"] = ctx.BaseURL()m["tenant"] = ctx.Tenant()m["auth"] = Map{@@ -68,7 +91,6 @@ func (r *Renderer) Render(w io.Writer, name string, data interface{}, ctx *Conteoauth.GitHubProvider: oauth.IsProviderEnabled(oauth.GitHubProvider),},}- m["settings"] = r.settingsif renderVars := ctx.RenderVars(); renderVars != nil {for key, value := range renderVars {@@ -81,15 +103,5 @@ func (r *Renderer) Render(w io.Writer, name string, data interface{}, ctx *Contem["email"] = ctx.User().Email}- files, _ := ioutil.ReadDir("dist/js")- if len(files) > 0 {- m["__JavaScriptBundle"] = files[0].Name()- }-- files, _ = ioutil.ReadDir("dist/css")- if len(files) > 0 {- m["__StyleBundle"] = files[0].Name()- }-return tmpl.Execute(w, m)}diff --git a/app/pkg/web/ssl.go b/app/pkg/web/ssl.goindex 7fef8a6a5..de9fe9bae 100644--- a/app/pkg/web/ssl.go+++ b/app/pkg/web/ssl.go@@ -44,7 +44,7 @@ func NewCertificateManager(certFile, keyFile, cacheDir string) (*CertificateMana//Otherwise fallsback to a automatically generated certificate by Let's Encryptfunc (m *CertificateManager) GetCertificate(hello *tls.ClientHelloInfo) (*tls.Certificate, error) {if m.leaf != nil {- if m.leaf.VerifyHostname(hello.ServerName) == nil {+ if hello.ServerName == "" || m.leaf.VerifyHostname(hello.ServerName) == nil {return &m.cert, nil}}diff --git a/routes.go b/routes.goindex 6986757f2..59b151799 100644--- a/routes.go+++ b/routes.go@@ -39,17 +39,16 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {emailer := initEmailer()r.Use(middlewares.Compress())- r.Use(middlewares.Setup(db, emailer))assets := r.Group(){- assets.Use(middlewares.ClientCache(72 * time.Hour))- assets.Use(middlewares.Tenant())- assets.Get("/avatars/:size/:id/:name", handlers.Avatar())+ assets.Use(middlewares.ClientCache(365 * 24 * time.Hour))assets.Static("/favicon.ico", "favicon.ico")assets.Static("/assets/*filepath", "dist")}+ r.Use(middlewares.Setup(db, emailer))+noTenant := r.Group(){noTenant.Post("/api/tenants", handlers.CreateTenant())@@ -64,15 +63,21 @@ func GetMainEngine(settings *models.AppSettings) *web.Engine {noTenant.Get("/oauth/github/callback", handlers.OAuthCallback(oauth.GitHubProvider))}+ r.Use(middlewares.Tenant())++ avatar := r.Group()+ {+ avatar.Use(middlewares.ClientCache(72 * time.Hour))+ avatar.Get("/avatars/:size/:id/:name", handlers.Avatar())+ }+verify := r.Group(){- verify.Use(middlewares.Tenant())verify.Get("/signup/verify", handlers.VerifySignUpKey())}page := r.Group(){- page.Use(middlewares.Tenant())page.Use(middlewares.JwtGetter())page.Use(middlewares.JwtSetter())page.Use(middlewares.OnlyActiveTenants())