commit dc7b7ef865f5ba568702e867a29408e7f1a25be7
parent c33a8528f864b71f046e0325121a809580d85531
Author: bep <bjorn.erik.pedersen@gmail.com>
Date: Fri, 20 Feb 2015 18:38:35 +0100
Avoid race condition in target list init
As reported by Go's race detector.
See #917
Diffstat:
| M | hugolib/site.go | | | 76 | ++++++++++++++++++++++++++++++++++++++++++---------------------------------- |
1 file changed, 42 insertions(+), 34 deletions(-)
diff --git a/hugolib/site.go b/hugolib/site.go
@@ -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)