diff options
| author | zeripath <art27@cantab.net> | 2022-08-28 10:43:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-28 10:43:25 +0100 |
| commit | bb0ff77e461ae080b1722701aea74010ff71e0ae (patch) | |
| tree | d9550dc2f4342ca5babc4bf9191fa51aacdb922e /routers/api/v1 | |
| parent | c21d6511a8e0084644a53a3192f45443456b9a32 (diff) | |
| download | gitea-bb0ff77e461ae080b1722701aea74010ff71e0ae.tar.gz gitea-bb0ff77e461ae080b1722701aea74010ff71e0ae.zip | |
Share HTML template renderers and create a watcher framework (#20218)
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>
Diffstat (limited to 'routers/api/v1')
| -rw-r--r-- | routers/api/v1/api.go | 5 | ||||
| -rw-r--r-- | routers/api/v1/misc/markdown_test.go | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/routers/api/v1/api.go b/routers/api/v1/api.go index e1478fa2aa..b413370ad2 100644 --- a/routers/api/v1/api.go +++ b/routers/api/v1/api.go @@ -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) } diff --git a/routers/api/v1/misc/markdown_test.go b/routers/api/v1/misc/markdown_test.go index 9beb88be16..7809fa5cc7 100644 --- a/routers/api/v1/misc/markdown_test.go +++ b/routers/api/v1/misc/markdown_test.go @@ -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, |