]> source.dussan.org Git - gitea.git/commitdiff
Ensure that template compilation panics are sent to the logs (#16788) (#16792)
authorzeripath <art27@cantab.net>
Mon, 23 Aug 2021 23:50:04 +0000 (00:50 +0100)
committerGitHub <noreply@github.com>
Mon, 23 Aug 2021 23:50:04 +0000 (19:50 -0400)
Backport #16788

Although panics within the rendering pipeline are caught and dealt with,
panics that occur before that starts are unprotected and will kill Gitea
without being sent to the logs.

This PR adds a basic recovery handler to catch panics that occur after
the logger is initialised and ensure that they're sent to the logger.

Signed-off-by: Andrew Thornton <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
cmd/web.go

index 6953e7c64f5d906255c3e03b109dade547c5ad4b..963c816207475181d11fc64e7efbae79646dcbb7 100644 (file)
@@ -86,6 +86,11 @@ func runWeb(ctx *cli.Context) error {
                _ = log.DelLogger("console")
                log.NewLogger(0, "console", "console", fmt.Sprintf(`{"level": "fatal", "colorize": %t, "stacktraceLevel": "none"}`, log.CanColorStdout))
        }
+       defer func() {
+               if panicked := recover(); panicked != nil {
+                       log.Fatal("PANIC: %v\n%s", panicked, string(log.Stack(2)))
+               }
+       }()
 
        managerCtx, cancel := context.WithCancel(context.Background())
        graceful.InitManager(managerCtx)