From 28d844642a1f450da26ac68e5bd542006be8fe5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Pedersen?= Date: Sun, 29 Oct 2023 10:57:27 +0100 Subject: =?UTF-8?q?Revert=20"modules:=20Throttle=20the=20"downloading=20mo?= =?UTF-8?q?dules=20=E2=80=A6"=20log=20entries"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 66904097e02fc3e846ec87a9db023df92cf613ba. --- modules/collect.go | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'modules/collect.go') diff --git a/modules/collect.go b/modules/collect.go index 148886607..5b5418bcd 100644 --- a/modules/collect.go +++ b/modules/collect.go @@ -15,7 +15,6 @@ package modules import ( "bufio" - "errors" "fmt" "os" "path/filepath" @@ -23,6 +22,7 @@ import ( "strings" "time" + "github.com/bep/debounce" "github.com/gohugoio/hugo/common/herrors" "github.com/gohugoio/hugo/common/loggers" @@ -37,6 +37,8 @@ import ( "github.com/rogpeppe/go-internal/module" + "errors" + "github.com/gohugoio/hugo/config" "github.com/spf13/afero" ) @@ -122,6 +124,7 @@ func (m ModulesConfig) HasConfigFile() bool { if len(mod.ConfigFilenames()) > 0 { return true } + } return false } @@ -217,6 +220,7 @@ func (c *collector) getVendoredDir(path string) (vendoredModule, bool) { } func (c *collector) add(owner *moduleAdapter, moduleImport Import) (*moduleAdapter, error) { + var ( mod *goModule moduleDir string @@ -505,10 +509,11 @@ LOOP: func (c *collector) collect() { defer c.logger.PrintTimerIfDelayed(time.Now(), "hugo: collected modules") - - c.throttle(func() { + d := debounce.New(2 * time.Second) + d(func() { c.logger.Println("hugo: downloading modules …") }) + defer d(func() {}) if err := c.initModules(); err != nil { c.err = err @@ -664,6 +669,7 @@ func (c *collector) normalizeMounts(owner *moduleAdapter, mounts []Mount) ([]Mou } else { continue } + } // Verify that target points to one of the predefined component dirs -- cgit v1.2.3