github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2025-04-04 08:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Handle errors during rereading properly

Browse source 
Without this fix, any error during rereading would cause Hugo to hang.
Fixes 
Closes
This commit is contained in:
Steve Francia 2016-06-02 16:47:28 -04:00 committed by Bjørn Erik Pedersen
parent d1cf262b74
commit f94cd2813d
1 changed files with 7 additions and 4 deletions

11
hugolib/site.go
View file

@ -505,11 +505,15 @@ func (s *Site) ReBuild(events []fsnotify.Event) error {
} }
file, err := s.reReadFile(ev.Name) file, err := s.reReadFile(ev.Name)
if err != nil { if err != nil {
errs <- err jww.ERROR.Println("Error reading file", ev.Name, ";", err)
}
if file != nil {
filechan <- file
} }
filechan <- file
} }
// we close the filechan as we have sent everything we want to send to it. // we close the filechan as we have sent everything we want to send to it.
// this will tell the sourceReaders to stop iterating on that channel // this will tell the sourceReaders to stop iterating on that channel
@ -559,8 +563,8 @@ func (s *Site) ReBuild(events []fsnotify.Event) error {
return nil return nil
} }
return err
return err
} }
func (s *Site) Analyze() error { func (s *Site) Analyze() error {
@ -835,7 +839,6 @@ func (s *Site) reReadFile(absFilePath string) (*source.File, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
file, err = source.NewFileFromAbs(s.absContentDir(), absFilePath, reader) file, err = source.NewFileFromAbs(s.absContentDir(), absFilePath, reader)
if err != nil { if err != nil {