finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Share HTML template renderers and create a watcher framework (#20218)

Browse source 
The recovery, API, Web and package frameworks all create their own HTML
Renderers. This increases the memory requirements of Gitea
unnecessarily with duplicate templates being kept in memory.

Further the reloading framework in dev mode for these involves locking
and recompiling all of the templates on each load. This will potentially
hide concurrency issues and it is inefficient.

This PR stores the templates renderer in the context and stores this
context in the NormalRoutes, it then creates a fsnotify.Watcher
framework to watch files.

The watching framework is then extended to the mailer templates which
were previously not being reloaded in dev.

Then the locales are simplified to a similar structure.

Fix #20210 
Fix #20211
Fix #20217

Signed-off-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
zeripath 2022-08-28 10:43:25 +01:00 • committed by GitHub
parent c21d6511a8
commit bb0ff77e46
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 902 additions and 618 deletions
Download patch file Download diff file Expand all files Collapse all files

9
routers/api/packages/api.go
View file

@ -5,6 +5,7 @@
package packages
import (
gocontext "context"
"net/http"
"regexp"
"strings"
@ -38,10 +39,10 @@ func reqPackageAccess(accessMode perm.AccessMode) func(ctx *context.Context) {
}
}
func Routes() *web.Route {
func Routes(ctx gocontext.Context) *web.Route {
r := web.NewRoute()
r.Use(context.PackageContexter())
r.Use(context.PackageContexter(ctx))
authMethods := []auth.Method{
&auth.OAuth2{},
@ -270,10 +271,10 @@ func Routes() *web.Route {
return r
}
func ContainerRoutes() *web.Route {
func ContainerRoutes(ctx gocontext.Context) *web.Route {
r := web.NewRoute()
r.Use(context.PackageContexter())
r.Use(context.PackageContexter(ctx))
authMethods := []auth.Method{
&auth.Basic{},

2
routers/api/packages/pypi/pypi.go
View file

@ -16,7 +16,6 @@ import (
packages_module "code.gitea.io/gitea/modules/packages"
pypi_module "code.gitea.io/gitea/modules/packages/pypi"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/templates"
"code.gitea.io/gitea/modules/validation"
"code.gitea.io/gitea/routers/api/packages/helper"
packages_service "code.gitea.io/gitea/services/packages"
@ -58,7 +57,6 @@ func PackageMetadata(ctx *context.Context) {
ctx.Data["RegistryURL"] = setting.AppURL + "api/packages/" + ctx.Package.Owner.Name + "/pypi"
ctx.Data["PackageDescriptor"] = pds[0]
ctx.Data["PackageDescriptors"] = pds
ctx.Render = templates.HTMLRenderer()
ctx.HTML(http.StatusOK, "api/packages/pypi/simple")
}

5
routers/api/v1/api.go
View file

@ -65,6 +65,7 @@
package v1
import (
gocontext "context"
"fmt"
"net/http"
"reflect"
@ -605,7 +606,7 @@ func buildAuthGroup() *auth.Group {
}
// Routes registers all v1 APIs routes to web application.
func Routes() *web.Route {
func Routes(ctx gocontext.Context) *web.Route {
m := web.NewRoute()
m.Use(securityHeaders())
@ -623,7 +624,7 @@ func Routes() *web.Route {
m.Use(context.APIContexter())
group := buildAuthGroup()
if err := group.Init(); err != nil {
if err := group.Init(ctx); err != nil {
log.Error("Could not initialize '%s' auth method, error: %s", group.Name(), err)
}

2
routers/api/v1/misc/markdown_test.go
View file

@ -29,7 +29,7 @@ const (
)
func createContext(req *http.Request) (*context.Context, *httptest.ResponseRecorder) {
rnd := templates.HTMLRenderer()
_, rnd := templates.HTMLRenderer(req.Context())
resp := httptest.NewRecorder()
c := &context.Context{
Req: req,