Skip to content
Permalink
Browse files

hugolib: Recover and log panics in content init

See #6210
  • Loading branch information...
bep committed Aug 15, 2019
1 parent 028b992 commit 7f3aab5ac283ecfc7029b680d4c0a34920e728c8
Showing with 10 additions and 2 deletions.
  1. +10 −2 hugolib/page__per_output.go
@@ -18,6 +18,7 @@ import (
"context"
"fmt"
"html/template"
"runtime/debug"
"strings"
"sync"
"unicode/utf8"
@@ -65,8 +66,15 @@ func newPageContentOutput(p *pageState) func(f output.Format) (*pageContentOutpu
f: f,
}

initContent := func() error {
var err error
initContent := func() (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

cp.contentPlaceholders, hasVariants, err = p.shortcodeState.renderShortcodesForPage(p, f)

0 comments on commit 7f3aab5

Please sign in to comment.
You can’t perform that action at this time.