celediel/burning.moe
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

reexport RegenerateTemplateCache() and have it return error instead of dying

Browse source
This commit is contained in:
Lilian Jónsdóttir 2024-01-30 10:55:49 -08:00
parent d0be48a532
commit 7451953d43
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
internal/render/render.go
View file

@ -37,7 +37,10 @@ func Initialise(a *config.AppConfig) {
func RenderTemplate(w http.ResponseWriter, filename string) { func RenderTemplate(w http.ResponseWriter, filename string) {
// TODO: implement this better // TODO: implement this better
if !app.UseCache { if !app.UseCache {
regenerateTemplateCache() err := RegenerateTemplateCache()
if err != nil {
app.Logger.Fatal("Regenerating template cache failed!", err, "err")
}
} }
template, err := GetTemplateFromCache(filename) template, err := GetTemplateFromCache(filename)
@ -59,7 +62,10 @@ func RenderTemplate(w http.ResponseWriter, filename string) {
func RenderTemplateWithData(w http.ResponseWriter, filename string, data *models.TemplateData) { func RenderTemplateWithData(w http.ResponseWriter, filename string, data *models.TemplateData) {
if !app.UseCache { if !app.UseCache {
regenerateTemplateCache() err := RegenerateTemplateCache()
if err != nil {
app.Logger.Fatal("Regenerating template cache failed!", err, "err")
}
} }
template, err := GetTemplateFromCache(filename) template, err := GetTemplateFromCache(filename)
@ -104,13 +110,15 @@ func GetOrGenerateTemplateData(filename string) (*models.TemplateData, error) {
return &data, nil return &data, nil
} }
// regenerateTemplateCache regenerates the template cache // RegenerateTemplateCache regenerates the template cache
func regenerateTemplateCache() { func RegenerateTemplateCache() error {
c, err := generateNewTemplateCache() c, err := generateNewTemplateCache()
if err != nil { if err != nil {
app.Logger.Fatal("Error generating template cache, bailing out!", "err", err) // app.Logger.Fatal("Error generating template cache, bailing out!", "err", err)
return err
} }
app.TemplateCache = c app.TemplateCache = c
return nil
} }