Make sure there are only one HugoInfo instance

See #570

diff --git a/hugolib/hugo.go b/hugolib/hugo.go
index 24b09b2ee5480d4eaea9b048501d2853102e2907..3e4d02039660ee4e0ccf6559ac3846eb4b4ece29 100644 (file)
--- a/hugolib/hugo.go
+++ b/hugolib/hugo.go
@@ -7,6 +7,8 @@ var (
        BuildDate  string
 )
 
+var hugoInfo *HugoInfo
+
 // HugoInfo contains information about the current Hugo environment
 type HugoInfo struct {
        Version    string
@@ -15,11 +17,14 @@ type HugoInfo struct {
        BuildDate  string
 }
 
-func newHugoInfo() *HugoInfo {
-       return &HugoInfo{
-               Version:    Version,
-               CommitHash: CommitHash,
-               BuildDate:  BuildDate,
-               Generator:  `<meta name="generator" content="Hugo ` + Version + `" />`,
+func getHugoInfo() *HugoInfo {
+       if hugoInfo == nil {
+               hugoInfo = &HugoInfo{
+                       Version:    Version,
+                       CommitHash: CommitHash,
+                       BuildDate:  BuildDate,
+                       Generator:  `<meta name="generator" content="Hugo ` + Version + `" />`,
+               }
        }
+       return hugoInfo
 }

diff --git a/hugolib/node.go b/hugolib/node.go
index 8619b7c899f42fd45b4dfa77315c2fe5ef9921f4..85cf6aeb68fe2d11a712b390fa483e12d638ed82 100644 (file)
--- a/hugolib/node.go
+++ b/hugolib/node.go
@@ -29,7 +29,6 @@ type Node struct {
        Params      map[string]interface{}
        Date        time.Time
        Sitemap     Sitemap
-       hugo        *HugoInfo
        UrlPath
 }
 
@@ -79,10 +78,7 @@ func (n *Node) IsMenuCurrent(menuId string, inme *MenuEntry) bool {
 }
 
 func (n *Node) Hugo() *HugoInfo {
-       if n.hugo == nil {
-               n.hugo = newHugoInfo()
-       }
-       return n.hugo
+       return getHugoInfo()
 }
 
 func (n *Node) isSameAsDescendantMenu(inme *MenuEntry, parent *MenuEntry) bool {