diff options
author | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2023-03-14 12:18:42 +0100 |
---|---|---|
committer | Bjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com> | 2023-03-14 12:18:42 +0100 |
commit | 0fbab7cbc5a0b57ec875858111b178160d18acb5 (patch) | |
tree | ac718d00f98bf7df0cef4d82d3e8db527f85560d /commands | |
parent | f5eddf89bf6c8ea9571c16f301f6b449259e6187 (diff) |
commands: Fix data race in test
Note that this is a test fix only.
Diffstat (limited to 'commands')
-rw-r--r-- | commands/commandeer.go | 1 | ||||
-rw-r--r-- | commands/commands.go | 9 | ||||
-rw-r--r-- | commands/hugo.go | 1 |
3 files changed, 7 insertions, 4 deletions
diff --git a/commands/commandeer.go b/commands/commandeer.go index b77e9e908..45385d509 100644 --- a/commands/commandeer.go +++ b/commands/commandeer.go @@ -302,6 +302,7 @@ func (c *commandeer) loadConfig() error { cfg := c.DepsCfg c.configured = false cfg.Running = c.running + loggers.PanicOnWarning.Store(c.h.panicOnWarning) var dir string if c.h.source != "" { diff --git a/commands/commands.go b/commands/commands.go index c1042459d..5b47ad82e 100644 --- a/commands/commands.go +++ b/commands/commands.go @@ -208,9 +208,10 @@ type hugoBuilderCommon struct { baseURL string environment string - buildWatch bool - poll string - clock string + buildWatch bool + panicOnWarning bool + poll string + clock string gc bool @@ -299,7 +300,7 @@ func (cc *hugoBuilderCommon) handleFlags(cmd *cobra.Command) { cmd.Flags().Bool("enableGitInfo", false, "add Git revision, date, author, and CODEOWNERS info to the pages") cmd.Flags().BoolVar(&cc.gc, "gc", false, "enable to run some cleanup tasks (remove unused cache files) after the build") cmd.Flags().StringVar(&cc.poll, "poll", "", "set this to a poll interval, e.g --poll 700ms, to use a poll based approach to watch for file system changes") - cmd.Flags().BoolVar(&loggers.PanicOnWarning, "panicOnWarning", false, "panic on first WARNING log") + cmd.Flags().BoolVar(&cc.panicOnWarning, "panicOnWarning", false, "panic on first WARNING log") cmd.Flags().Bool("templateMetrics", false, "display metrics about template executions") cmd.Flags().Bool("templateMetricsHints", false, "calculate some improvement hints when combined with --templateMetrics") cmd.Flags().BoolP("forceSyncStatic", "", false, "copy all files when static is changed.") diff --git a/commands/hugo.go b/commands/hugo.go index 12575618b..1a35d1626 100644 --- a/commands/hugo.go +++ b/commands/hugo.go @@ -255,6 +255,7 @@ func initializeFlags(cmd *cobra.Command, cfg config.Provider) { setValueFromFlag(cmd.Flags(), "destination", cfg, "publishDir", false) setValueFromFlag(cmd.Flags(), "printI18nWarnings", cfg, "logI18nWarnings", false) setValueFromFlag(cmd.Flags(), "printPathWarnings", cfg, "logPathWarnings", false) + } func setValueFromFlag(flags *flag.FlagSet, key string, cfg config.Provider, targetKey string, force bool) { |