diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-02 16:07:52 +0200 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2022-05-06 19:43:22 +0200 |
commit | f2946da9e806c2bafbdd26707fe339db79bd980b (patch) | |
tree | b5609317a861ea5f399e094e1b9287ca71dc22d1 /hugolib/hugo_sites_build.go | |
parent | 6eea32bd6bc8e7a7dd07a8cb6a8343ae2c74aba0 (diff) |
Improve error messages, esp. when the server is running
* Add file context to minifier errors when publishing
* Misc fixes (see issues)
* Allow custom server error template in layouts/server/error.html
To get to this, this commit also cleans up and simplifies the code surrounding errors and files. This also removes the usage of `github.com/pkg/errors`, mostly because of https://github.com/pkg/errors/issues/223 -- but also because most of this is now built-in to Go.
Fixes #9852
Fixes #9857
Fixes #9863
Diffstat (limited to 'hugolib/hugo_sites_build.go')
-rw-r--r-- | hugolib/hugo_sites_build.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/hugolib/hugo_sites_build.go b/hugolib/hugo_sites_build.go index 4616b6dbb..1a191257c 100644 --- a/hugolib/hugo_sites_build.go +++ b/hugolib/hugo_sites_build.go @@ -35,7 +35,7 @@ import ( "github.com/gohugoio/hugo/output" - "github.com/pkg/errors" + "errors" "github.com/fsnotify/fsnotify" "github.com/gohugoio/hugo/helpers" @@ -50,7 +50,7 @@ func (h *HugoSites) Build(config BuildCfg, events ...fsnotify.Event) error { if !config.NoBuildLock { unlock, err := h.BaseFs.LockBuild() if err != nil { - return errors.Wrap(err, "failed to acquire a build lock") + return fmt.Errorf("failed to acquire a build lock: %w", err) } defer unlock() } @@ -99,11 +99,11 @@ func (h *HugoSites) Build(config BuildCfg, events ...fsnotify.Event) error { if len(events) > 0 { // Rebuild if err := h.initRebuild(conf); err != nil { - return errors.Wrap(err, "initRebuild") + return fmt.Errorf("initRebuild: %w", err) } } else { if err := h.initSites(conf); err != nil { - return errors.Wrap(err, "initSites") + return fmt.Errorf("initSites: %w", err) } } @@ -117,7 +117,7 @@ func (h *HugoSites) Build(config BuildCfg, events ...fsnotify.Event) error { } trace.WithRegion(ctx, "process", f) if err != nil { - return errors.Wrap(err, "process") + return fmt.Errorf("process: %w", err) } f = func() { |