shithub: hugo

Info  •  Files  •  Log  •  Branches

hugolib: Fix timeout number parsing for YAML/JSON config

Where numbers are all floats.

Fixes #6555

--- a/hugolib/image_test.go

+++ b/hugolib/image_test.go

@@ -36,7 +36,7 @@

 	c.Assert(err, qt.IsNil)

 	defer clean()

-	newBuilder := func(timeout string) *sitesBuilder {

+	newBuilder := func(timeout interface{}) *sitesBuilder {

 		v := viper.New()

 		v.Set("workingDir", workDir)

@@ -152,7 +152,7 @@

 		c.Assert(err, qt.Not(qt.IsNil))

 	}

-	b = newBuilder("30s")

+	b = newBuilder(29000)

 	b.Build(BuildCfg{})

 	assertImages()

--- a/hugolib/site.go

+++ b/hugolib/site.go

@@ -413,11 +413,11 @@

 	timeout := 30 * time.Second

 	if cfg.Language.IsSet("timeout") {

-		switch v := cfg.Language.Get("timeout").(type) {

-		case int64:

-			timeout = time.Duration(v) * time.Millisecond

-		case string:

-			d, err := time.ParseDuration(v)

+		v := cfg.Language.Get("timeout")

+		if n := cast.ToInt(v); n > 0 {

+			timeout = time.Duration(n) * time.Millisecond

+		} else {

+			d, err := time.ParseDuration(cast.ToString(v))

 			if err == nil {

 				timeout = d

 			}