From c59e1537a8bb57af0ca19c0adfe8ab613c567193 Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Tue, 3 Jan 2023 15:17:36 +0800
Subject: [PATCH] Display error log when a modified template has an error so
that it could recovery when the error fixed (#22261)
A drawback is the previous generated template has been cached, so you
cannot get error in the UI but only from log
Co-authored-by: KN4CK3R <admin@oldschoolhack.me>
Co-authored-by: delvh <dev.lh@web.de>
---
modules/templates/htmlrenderer.go | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/modules/templates/htmlrenderer.go b/modules/templates/htmlrenderer.go
index 7ab523822b4..5a328043ebf 100644
--- a/modules/templates/htmlrenderer.go
+++ b/modules/templates/htmlrenderer.go
@@ -75,8 +75,15 @@ func HTMLRenderer(ctx context.Context) (context.Context, *render.Render) {
compilingTemplates = false
if !setting.IsProd {
watcher.CreateWatcher(ctx, "HTML Templates", &watcher.CreateWatcherOpts{
- PathsCallback: walkTemplateFiles,
- BetweenCallback: renderer.CompileTemplates,
+ PathsCallback: walkTemplateFiles,
+ BetweenCallback: func() {
+ defer func() {
+ if err := recover(); err != nil {
+ log.Error("PANIC: %v\n%s", err, log.Stack(2))
+ }
+ }()
+ renderer.CompileTemplates()
+ },
})
}
return context.WithValue(ctx, rendererKey, renderer), renderer