github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

commands: Fix server deadlock on config error

Browse source 
Fixes #9486
This commit is contained in:
Bjørn Erik Pedersen 2022-02-10 17:12:02 +01:00
parent f7bc4cc505
commit a2a660ed12
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
commands/commandeer.go
View file

@ -61,6 +61,8 @@ type commandeer struct {
logger loggers.Logger logger loggers.Logger
serverConfig *config.Server serverConfig *config.Server
buildLock func() (unlock func(), err error)
// Loading state // Loading state
mustHaveConfigFile bool mustHaveConfigFile bool
failOnInitErr bool failOnInitErr bool
@ -419,6 +421,10 @@ func (c *commandeer) loadConfig() error {
err = createErr err = createErr
} }
c.hugoSites = h c.hugoSites = h
// TODO(bep) improve.
if c.buildLock == nil {
c.buildLock = h.LockBuild
}
close(c.created) close(c.created)
}) })

2
commands/hugo.go
View file

@ -869,7 +869,7 @@ func (c *commandeer) newWatcher(pollIntervalStr string, dirList ...string) (*wat
for { for {
select { select {
case evs := <-watcher.Events: case evs := <-watcher.Events:
unlock, err := c.hugo().BaseFs.LockBuild() unlock, err := c.buildLock()
if err != nil { if err != nil {
c.logger.Errorln("Failed to acquire a build lock: %s", err) c.logger.Errorln("Failed to acquire a build lock: %s", err)
return return