diff options
author | Bjørn Erik Pedersen <[email protected]> | 2018-10-03 14:58:09 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <[email protected]> | 2018-10-16 22:10:56 +0200 |
commit | 35fbfb19a173b01bc881f2bbc5d104136633a7ec (patch) | |
tree | 636d0d51fa262dc808eb3c5cc9cf92ad977a0c6a /hugolib/site_render.go | |
parent | 3a3089121b852332b5744d1f566959c8cf93cef4 (diff) | |
download | hugo-35fbfb19a173b01bc881f2bbc5d104136633a7ec.tar.gz hugo-35fbfb19a173b01bc881f2bbc5d104136633a7ec.zip |
commands: Show server error info in browser
The main item in this commit is showing of errors with a file context when running `hugo server`.
This can be turned off: `hugo server --disableBrowserError` (can also be set in `config.toml`).
But to get there, the error handling in Hugo needed a revision. There are some items left TODO for commits soon to follow, most notable errors in content and config files.
Fixes #5284
Fixes #5290
See #5325
See #5324
Diffstat (limited to 'hugolib/site_render.go')
-rw-r--r-- | hugolib/site_render.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/hugolib/site_render.go b/hugolib/site_render.go index 1f2c5c708..13fbb43cd 100644 --- a/hugolib/site_render.go +++ b/hugolib/site_render.go @@ -19,6 +19,8 @@ import ( "strings" "sync" + "github.com/pkg/errors" + "github.com/gohugoio/hugo/output" ) @@ -30,7 +32,7 @@ func (s *Site) renderPages(cfg *BuildCfg) error { pages := make(chan *Page) errs := make(chan error) - go errorCollator(results, errs) + go s.errorCollator(results, errs) numWorkers := getGoMaxProcs() * 4 @@ -60,7 +62,7 @@ func (s *Site) renderPages(cfg *BuildCfg) error { err := <-errs if err != nil { - return fmt.Errorf("Error(s) rendering pages: %s", err) + return errors.Wrap(err, "failed to render pages") } return nil } @@ -132,6 +134,7 @@ func pageRenderer(s *Site, pages <-chan *Page, results chan<- error, wg *sync.Wa if shouldRender { if err := pageOutput.renderResources(); err != nil { + // TODO(bep) 2errors s.Log.ERROR.Printf("Failed to render resources for page %q: %s", page, err) continue } |