mirror of
https://github.com/gohugoio/hugo.git
synced 2024-11-07 20:30:36 -05:00
Avoid race condition in target list init
As reported by Go's race detector. See #917
This commit is contained in:
parent
c33a8528f8
commit
dc7b7ef865
1 changed files with 42 additions and 34 deletions
|
@ -66,23 +66,24 @@ var DefaultTimer *nitro.B
|
|||
//
|
||||
// 5. The entire collection of files is written to disk.
|
||||
type Site struct {
|
||||
Pages Pages
|
||||
Files []*source.File
|
||||
Tmpl tpl.Template
|
||||
Taxonomies TaxonomyList
|
||||
Source source.Input
|
||||
Sections Taxonomy
|
||||
Info SiteInfo
|
||||
Shortcodes map[string]ShortcodeFunc
|
||||
Menus Menus
|
||||
timer *nitro.B
|
||||
Targets targetList
|
||||
Completed chan bool
|
||||
RunMode runmode
|
||||
params map[string]interface{}
|
||||
draftCount int
|
||||
futureCount int
|
||||
Data map[string]interface{}
|
||||
Pages Pages
|
||||
Files []*source.File
|
||||
Tmpl tpl.Template
|
||||
Taxonomies TaxonomyList
|
||||
Source source.Input
|
||||
Sections Taxonomy
|
||||
Info SiteInfo
|
||||
Shortcodes map[string]ShortcodeFunc
|
||||
Menus Menus
|
||||
timer *nitro.B
|
||||
Targets targetList
|
||||
targetListInit sync.Once
|
||||
Completed chan bool
|
||||
RunMode runmode
|
||||
params map[string]interface{}
|
||||
draftCount int
|
||||
futureCount int
|
||||
Data map[string]interface{}
|
||||
}
|
||||
|
||||
type targetList struct {
|
||||
|
@ -1454,34 +1455,41 @@ func (s *Site) NewXMLBuffer() *bytes.Buffer {
|
|||
}
|
||||
|
||||
func (s *Site) PageTarget() target.Output {
|
||||
if s.Targets.Page == nil {
|
||||
s.Targets.Page = &target.PagePub{
|
||||
PublishDir: s.absPublishDir(),
|
||||
UglyUrls: viper.GetBool("UglyUrls"),
|
||||
}
|
||||
}
|
||||
s.initTargetList()
|
||||
return s.Targets.Page
|
||||
}
|
||||
|
||||
func (s *Site) FileTarget() target.Output {
|
||||
if s.Targets.File == nil {
|
||||
s.Targets.File = &target.Filesystem{
|
||||
PublishDir: s.absPublishDir(),
|
||||
}
|
||||
}
|
||||
s.initTargetList()
|
||||
return s.Targets.File
|
||||
}
|
||||
|
||||
func (s *Site) AliasTarget() target.AliasPublisher {
|
||||
if s.Targets.Alias == nil {
|
||||
s.Targets.Alias = &target.HTMLRedirectAlias{
|
||||
PublishDir: s.absPublishDir(),
|
||||
}
|
||||
|
||||
}
|
||||
s.initTargetList()
|
||||
return s.Targets.Alias
|
||||
}
|
||||
|
||||
func (s *Site) initTargetList() {
|
||||
s.targetListInit.Do(func() {
|
||||
if s.Targets.Page == nil {
|
||||
s.Targets.Page = &target.PagePub{
|
||||
PublishDir: s.absPublishDir(),
|
||||
UglyUrls: viper.GetBool("UglyUrls"),
|
||||
}
|
||||
}
|
||||
if s.Targets.File == nil {
|
||||
s.Targets.File = &target.Filesystem{
|
||||
PublishDir: s.absPublishDir(),
|
||||
}
|
||||
}
|
||||
if s.Targets.Alias == nil {
|
||||
s.Targets.Alias = &target.HTMLRedirectAlias{
|
||||
PublishDir: s.absPublishDir(),
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
func (s *Site) WriteDestFile(path string, reader io.Reader) (err error) {
|
||||
jww.DEBUG.Println("creating file:", path)
|
||||
return s.FileTarget().Publish(path, reader)
|
||||
|
|
Loading…
Reference in a new issue