diff options
| author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-10-03 14:58:09 +0200 |
|---|---|---|
| committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2018-10-16 22:10:56 +0200 |
| commit | 35fbfb19a173b01bc881f2bbc5d104136633a7ec (patch) | |
| tree | 636d0d51fa262dc808eb3c5cc9cf92ad977a0c6a /hugolib/paths/paths.go | |
| parent | 3a3089121b852332b5744d1f566959c8cf93cef4 (diff) | |
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/paths/paths.go')
| -rw-r--r-- | hugolib/paths/paths.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/hugolib/paths/paths.go b/hugolib/paths/paths.go index 625d68ec6..05d5019d2 100644 --- a/hugolib/paths/paths.go +++ b/hugolib/paths/paths.go @@ -20,6 +20,7 @@ import ( "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/langs" + "github.com/pkg/errors" "github.com/gohugoio/hugo/hugofs" ) @@ -83,13 +84,13 @@ func New(fs *hugofs.Fs, cfg config.Provider) (*Paths, error) { baseURL, err := newBaseURLFromString(baseURLstr) if err != nil { - return nil, fmt.Errorf("Failed to create baseURL from %q: %s", baseURLstr, err) + return nil, errors.Wrapf(err, "Failed to create baseURL from %q:", baseURLstr) } - contentDir := cfg.GetString("contentDir") - workingDir := cfg.GetString("workingDir") - resourceDir := cfg.GetString("resourceDir") - publishDir := cfg.GetString("publishDir") + contentDir := filepath.Clean(cfg.GetString("contentDir")) + workingDir := filepath.Clean(cfg.GetString("workingDir")) + resourceDir := filepath.Clean(cfg.GetString("resourceDir")) + publishDir := filepath.Clean(cfg.GetString("publishDir")) if contentDir == "" { return nil, fmt.Errorf("contentDir not set") |