Add some more output if loading modules takes time

Also include the time to collect modules etc. in the "Total in ..." time reported for the `hugo` command.

Fixes #6519

2 files changed, 6 insertions, 3 deletions

diff --git a/modules/client.go b/modules/client.go
index a743df5bd..462cd6017 100644
--- a/modules/client.go
+++ b/modules/client.go
@@ -259,7 +259,7 @@ func (c *Client) Vendor() error {
 
 // Get runs "go get" with the supplied arguments.
 func (c *Client) Get(args ...string) error {
-	if err := c.runGo(context.Background(), os.Stdout, append([]string{"get"}, args...)...); err != nil {
+	if err := c.runGo(context.Background(), c.logger.Out, append([]string{"get"}, args...)...); err != nil {
 		errors.Wrapf(err, "failed to get %q", args)
 	}
 	return nil
@@ -269,7 +269,7 @@ func (c *Client) Get(args ...string) error {
 // If path is empty, Go will try to guess.
 // If this succeeds, this project will be marked as Go Module.
 func (c *Client) Init(path string) error {
-	err := c.runGo(context.Background(), os.Stdout, "mod", "init", path)
+	err := c.runGo(context.Background(), c.logger.Out, "mod", "init", path)
 	if err != nil {
 		return errors.Wrap(err, "failed to init modules")
 	}
@@ -410,6 +410,8 @@ func (c *Client) runGo(
 		return nil
 	}
 
+	//defer c.logger.PrintTimer(time.Now(), fmt.Sprint(args))
+
 	stderr := new(bytes.Buffer)
 	cmd := exec.CommandContext(ctx, "go", args...)
 
diff --git a/modules/collect.go b/modules/collect.go
index f5972a5b0..5f377c6dd 100644
--- a/modules/collect.go
+++ b/modules/collect.go
@@ -19,6 +19,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/gohugoio/hugo/common/loggers"
 
@@ -468,7 +469,7 @@ func (c *collector) applyThemeConfig(tc *moduleAdapter) error {
 }
 
 func (c *collector) collect() {
-
+	defer c.logger.PrintTimerIfDelayed(time.Now(), "hugo: collected modules")
 	if err := c.initModules(); err != nil {
 		c.err = err
 		return