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

Implement structured logging using log/slog package

Browse source
This commit is contained in:
Frédéric Guillot 2023-09-24 16:32:09 -07:00
parent 54cb8fa028
commit c0e954f19d
77 changed files with 1868 additions and 892 deletions
Download patch file Download diff file Expand all files Collapse all files

15
internal/template/engine.go
View file

@ -7,12 +7,12 @@ import (
"bytes"
"embed"
"html/template"
"log/slog"
"strings"
"time"
"miniflux.app/v2/internal/errors"
"miniflux.app/v2/internal/locale"
"miniflux.app/v2/internal/logger"
"github.com/gorilla/mux"
)
@ -73,7 +73,10 @@ func (e *Engine) ParseTemplates() error {
templateContents.WriteString(commonTemplateContents.String())
templateContents.Write(fileData)
logger.Debug("[Template] Parsing: %s", templateName)
slog.Debug("Parsing template",
slog.String("template_name", templateName),
)
e.templates[templateName] = template.Must(template.New("main").Funcs(e.funcMap.Map()).Parse(templateContents.String()))
}
@ -89,7 +92,9 @@ func (e *Engine) ParseTemplates() error {
return err
}
logger.Debug("[Template] Parsing: %s", templateName)
slog.Debug("Parsing template",
slog.String("template_name", templateName),
)
e.templates[templateName] = template.Must(template.New("base").Funcs(e.funcMap.Map()).Parse(string(fileData)))
}
@ -100,7 +105,7 @@ func (e *Engine) ParseTemplates() error {
func (e *Engine) Render(name string, data map[string]interface{}) []byte {
tpl, ok := e.templates[name]
if !ok {
logger.Fatal("[Template] The template %s does not exists", name)
panic("This template does not exists: " + name)
}
printer := locale.NewPrinter(data["language"].(string))
@ -132,7 +137,7 @@ func (e *Engine) Render(name string, data map[string]interface{}) []byte {
var b bytes.Buffer
err := tpl.ExecuteTemplate(&b, "base", data)
if err != nil {
logger.Fatal("[Template] Unable to render template: %v", err)
panic(err)
}
return b.Bytes()