IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix data race in dev runtime (#88887)

Browse Source
This commit is contained in:
Diego Augusto Molina 2024-06-10 08:30:17 -03:00 committed by GitHub
parent 9a44296bc2
commit 4378f89fd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/web/render.go
View File

@ -21,12 +21,15 @@ import (
"net/http"
"os"
"path/filepath"
"golang.org/x/sync/singleflight"
)
// Renderer is a Middleware that injects a template renderer into the macaron context, enabling ctx.HTML calls in the handlers.
// If MACARON_ENV is set to "development" then templates will be recompiled on every request. For more performance, set the
// MACARON_ENV environment variable to "production".
func Renderer(dir, leftDelim, rightDelim string) Middleware {
var devEnvGr singleflight.Group
fs := os.DirFS(dir)
t, err := compileTemplates(fs, leftDelim, rightDelim)
if err != nil {
@ -35,12 +38,16 @@ func Renderer(dir, leftDelim, rightDelim string) Middleware {
return func(next http.Handler) http.Handler {
return http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
ctx := FromContext(req.Context())
ctx.template = t
if Env == DEV {
if t, err = compileTemplates(fs, leftDelim, rightDelim); err != nil {
tt, err, _ := devEnvGr.Do("dev", func() (any, error) {
return compileTemplates(fs, leftDelim, rightDelim)
})
if err != nil {
panic("Context.HTML:" + err.Error())
}
ctx.template = tt.(*template.Template)
}
ctx.template = t
next.ServeHTTP(rw, req)
})
}