summaryrefslogtreecommitdiffstats
path: root/commands/commandeer.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-11-21 13:07:52 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2019-11-21 18:11:07 +0100
commit2dcc1318d1d9ed849d040115aa5ba6191a1c102a (patch)
tree913e5537df47c555a1d00e44d97609341edb36c3 /commands/commandeer.go
parent14a985f8abc527d4e8487fcd5fa742e1ab2a00ed (diff)
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
Diffstat (limited to 'commands/commandeer.go')
-rw-r--r--commands/commandeer.go8
1 files changed, 7 insertions, 1 deletions
diff --git a/commands/commandeer.go b/commands/commandeer.go
index b9e2ceef1..af711fdd6 100644
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -163,6 +163,11 @@ func newCommandeer(mustHaveConfigFile, running bool, h *hugoBuilderCommon, f fla
rebuildDebouncer = debounce.New(4 * time.Second)
}
+ out := ioutil.Discard
+ if !h.quiet {
+ out = os.Stdout
+ }
+
c := &commandeer{
h: h,
ftch: f,
@@ -172,7 +177,7 @@ func newCommandeer(mustHaveConfigFile, running bool, h *hugoBuilderCommon, f fla
debounce: rebuildDebouncer,
fullRebuildSem: semaphore.NewWeighted(1),
// This will be replaced later, but we need something to log to before the configuration is read.
- logger: loggers.NewLogger(jww.LevelError, jww.LevelError, os.Stdout, ioutil.Discard, running),
+ logger: loggers.NewLogger(jww.LevelError, jww.LevelError, out, ioutil.Discard, running),
}
return c, c.loadConfig(mustHaveConfigFile, running)
@@ -296,6 +301,7 @@ func (c *commandeer) loadConfig(mustHaveConfigFile, running bool) error {
config, configFiles, err := hugolib.LoadConfig(
hugolib.ConfigSourceDescriptor{
Fs: sourceFs,
+ Logger: c.logger,
Path: configPath,
WorkingDir: dir,
Filename: c.h.cfgFile,