Report back template errors

Author: brechtvl

modules/templates/htmlrenderer.go

@@ -96,10 +96,12 @@ func HTMLRenderer() *HTMLRender {
 	return htmlRender
 }
 
-func ReloadHTMLTemplates() {
+func ReloadHTMLTemplates() error {
 	if err := htmlRender.CompileTemplates(); err != nil {
 		log.Error("Template error: %v\n%s", err, log.Stack(2))
+		return err
 	}
+	return nil
 }
 
 func initHTMLRenderer() {
@@ -121,7 +123,7 @@ func initHTMLRenderer() {
 
 	if !setting.IsProd {
 		go AssetFS().WatchLocalChanges(graceful.GetManager().ShutdownContext(), func() {
-			ReloadHTMLTemplates()
+			_ = ReloadHTMLTemplates()
 		})
 	}
 }

routers/private/manager.go

@@ -21,7 +21,13 @@ import (
 
 // ReloadTemplates reloads all the templates
 func ReloadTemplates(ctx *context.PrivateContext) {
-	templates.ReloadHTMLTemplates()
+	err := templates.ReloadHTMLTemplates()
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, private.Response{
+			UserMsg: fmt.Sprintf("Template error: %v", err),
+		})
+		return
+	}
 	ctx.PlainText(http.StatusOK, "success")
 }