summaryrefslogtreecommitdiffstats
path: root/transform
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-05-02 16:07:52 +0200
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-05-06 19:43:22 +0200
commitf2946da9e806c2bafbdd26707fe339db79bd980b (patch)
treeb5609317a861ea5f399e094e1b9287ca71dc22d1 /transform
parent6eea32bd6bc8e7a7dd07a8cb6a8343ae2c74aba0 (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 'transform')
-rw-r--r--transform/chain.go15
1 files changed, 14 insertions, 1 deletions
diff --git a/transform/chain.go b/transform/chain.go
index 74217dc72..2d70b9356 100644
--- a/transform/chain.go
+++ b/transform/chain.go
@@ -16,8 +16,11 @@ package transform
import (
"bytes"
"io"
+ "io/ioutil"
bp "github.com/gohugoio/hugo/bufferpool"
+ "github.com/gohugoio/hugo/common/herrors"
+ "github.com/gohugoio/hugo/hugofs"
)
// Transformer is the func that needs to be implemented by a transformation step.
@@ -103,7 +106,17 @@ func (c *Chain) Apply(to io.Writer, from io.Reader) error {
}
if err := tr(fb); err != nil {
- return err
+ // Write output to a temp file so it can be read by the user for trouble shooting.
+ filename := "output.html"
+ tempfile, ferr := ioutil.TempFile("", "hugo-transform-error")
+ if ferr == nil {
+ filename = tempfile.Name()
+ defer tempfile.Close()
+ _, _ = io.Copy(tempfile, fb.from)
+ return herrors.NewFileErrorFromFile(err, filename, filename, hugofs.Os, nil)
+ }
+ return herrors.NewFileError(filename, err).UpdateContent(fb.from, nil)
+
}
}