diff options
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/deps.go | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/deps/deps.go b/deps/deps.go index 02730e825..6842c7331 100644 --- a/deps/deps.go +++ b/deps/deps.go @@ -11,6 +11,7 @@ import ( "github.com/gohugoio/hugo/cache/filecache" "github.com/gohugoio/hugo/common/hexec" "github.com/gohugoio/hugo/common/loggers" + "github.com/gohugoio/hugo/common/types" "github.com/gohugoio/hugo/config" "github.com/gohugoio/hugo/config/security" "github.com/gohugoio/hugo/helpers" @@ -298,11 +299,14 @@ func New(cfg DepsCfg) (*Deps, error) { sp := source.NewSourceSpec(ps, nil, fs.Source) - timeoutms := cfg.Language.GetInt("timeout") - if timeoutms <= 0 { - timeoutms = 3000 + timeout := 30 * time.Second + if cfg.Cfg.IsSet("timeout") { + v := cfg.Cfg.Get("timeout") + d, err := types.ToDurationE(v) + if err == nil { + timeout = d + } } - ignoreErrors := cast.ToStringSlice(cfg.Cfg.Get("ignoreErrors")) ignorableLogger := loggers.NewIgnorableLogger(logger, ignoreErrors...) @@ -329,7 +333,7 @@ func New(cfg DepsCfg) (*Deps, error) { BuildClosers: &Closers{}, BuildState: buildState, Running: cfg.Running, - Timeout: time.Duration(timeoutms) * time.Millisecond, + Timeout: timeout, globalErrHandler: errorHandler, } |