github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-12-30 19:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

hugolib: Recover and log panics in content init

Browse source 
See #6210
This commit is contained in:
Bjørn Erik Pedersen 2019-08-15 10:56:49 +02:00
parent 028b992611
commit 7f3aab5ac2
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
hugolib/page__per_output.go
View file

@ -18,6 +18,7 @@ import (
"context" "context"
"fmt" "fmt"
"html/template" "html/template"
"runtime/debug"
"strings" "strings"
"sync" "sync"
"unicode/utf8" "unicode/utf8"
@ -65,8 +66,15 @@ func newPageContentOutput(p *pageState) func(f output.Format) (*pageContentOutpu
f: f, f: f,
} }
initContent := func() error { initContent := func() (err error) {
var err error defer func() {
// See https://github.com/gohugoio/hugo/issues/6210
if r := recover(); r != nil {
err = fmt.Errorf("%s", r)
p.s.Log.ERROR.Println("[BUG] Got panic:\n", string(debug.Stack()))
}
}()
var hasVariants bool var hasVariants bool
cp.contentPlaceholders, hasVariants, err = p.shortcodeState.renderShortcodesForPage(p, f) cp.contentPlaceholders, hasVariants, err = p.shortcodeState.renderShortcodesForPage(p, f)