Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/gohugoio/hugo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-02-10 19:12:02 +0300
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2022-02-10 21:43:47 +0300
commita2a660ed1209528b075a21af84fc0ed3e7b266ef (patch)
tree3765f5c5a5f46f518d7d806d20859e7b480fc905 /commands/commandeer.go
parentf7bc4cc505950df738ab11aa3c611f324dd6c158 (diff)
commands: Fix server deadlock on config error
Fixes #9486
Diffstat (limited to 'commands/commandeer.go')
-rw-r--r--commands/commandeer.go6
1 files changed, 6 insertions, 0 deletions
diff --git a/commands/commandeer.go b/commands/commandeer.go
index 7706360ab..304ef7a7c 100644
--- a/commands/commandeer.go
+++ b/commands/commandeer.go
@@ -61,6 +61,8 @@ type commandeer struct {
logger loggers.Logger
serverConfig *config.Server
+ buildLock func() (unlock func(), err error)
+
// Loading state
mustHaveConfigFile bool
failOnInitErr bool
@@ -419,6 +421,10 @@ func (c *commandeer) loadConfig() error {
err = createErr
}
c.hugoSites = h
+ // TODO(bep) improve.
+ if c.buildLock == nil {
+ c.buildLock = h.LockBuild
+ }
close(c.created)
})