summaryrefslogtreecommitdiffstats
path: root/commands/hugo.go
diff options
context:
space:
mode:
authorBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2018-01-14 20:58:52 +0100
committerBjørn Erik Pedersen <bjorn.erik.pedersen@gmail.com>2018-01-14 20:58:52 +0100
commit4e524ffcfff48c017717e261c6067416aa56410f (patch)
tree57a3819be5e61defe3e5237460fd1a7054958aa8 /commands/hugo.go
parent64f0e9d1c1d4ff2249fd9cf9749e70485002b36d (diff)
commands: Fix server without watch
This was broken in Hugo 0.30. Fixes #4275
Diffstat (limited to 'commands/hugo.go')
-rw-r--r--commands/hugo.go15
1 files changed, 2 insertions, 13 deletions
diff --git a/commands/hugo.go b/commands/hugo.go
index 51375ea8a..67ebc8512 100644
--- a/commands/hugo.go
+++ b/commands/hugo.go
@@ -30,7 +30,6 @@ import (
"path/filepath"
"runtime"
"strings"
- "sync"
"time"
src "github.com/gohugoio/hugo/source"
@@ -633,7 +632,7 @@ func (c *commandeer) build(watches ...bool) error {
}
c.Logger.FEEDBACK.Println("Watching for changes in", c.PathSpec().AbsPathify(c.Cfg.GetString("contentDir")))
c.Logger.FEEDBACK.Println("Press Ctrl+C to stop")
- utils.CheckErr(c.Logger, c.newWatcher(false, watchDirs...))
+ utils.CheckErr(c.Logger, c.newWatcher(watchDirs...))
}
return nil
@@ -969,9 +968,7 @@ func (c *commandeer) rebuildSites(events []fsnotify.Event) error {
}
// newWatcher creates a new watcher to watch filesystem events.
-// if serve is set it will also start one or more HTTP servers to serve those
-// files.
-func (c *commandeer) newWatcher(serve bool, dirList ...string) error {
+func (c *commandeer) newWatcher(dirList ...string) error {
if runtime.GOOS == "darwin" {
tweakLimit()
}
@@ -982,7 +979,6 @@ func (c *commandeer) newWatcher(serve bool, dirList ...string) error {
}
watcher, err := watcher.New(1 * time.Second)
- var wg sync.WaitGroup
if err != nil {
return err
@@ -990,8 +986,6 @@ func (c *commandeer) newWatcher(serve bool, dirList ...string) error {
defer watcher.Close()
- wg.Add(1)
-
for _, d := range dirList {
if d != "" {
_ = watcher.Add(d)
@@ -1189,11 +1183,6 @@ func (c *commandeer) newWatcher(serve bool, dirList ...string) error {
}
}()
- if serve {
- go c.serve()
- }
-
- wg.Wait()
return nil
}