Add MC Query caching support.

pageHandler/pages/index/data.go

@@ -14,6 +14,7 @@ type DataYaml struct {
 	MCProtocolVersion             int           `yaml:"mcProtocolVersion"`
 	MCClientGUID                  int64         `yaml:"mcClientGUID"`
 	MCTimeout                     time.Duration `yaml:"mcTimeout"`
+	MCQueryInterval               time.Duration `yaml:"mcQueryInterval"`
 	AllowDisplayState             bool          `yaml:"allowDisplayState"`
 	AllowDisplayVersion           bool          `yaml:"allowDisplayVersion"`
 	AllowDisplayActualAddress     bool          `yaml:"allowDisplayActualAddress"`

pageHandler/pages/index/index-page.go

@@ -38,6 +38,8 @@ type Page struct {
 	PageTemplateMutex    *sync.Mutex
 	PageTemplate         *template.Template
 	LastModifiedTemplate time.Time
+	CachedMC             *MC
+	CollectedMCExpiry    time.Time
 }
 
 func (p *Page) GetPath() string {
@@ -95,11 +97,25 @@ func (p *Page) GetContents(urlParameters url.Values) (contentType string, conten
 		Parameters:    template.URL(p.getNonThemedCleanQuery(urlParameters)),
 		Online:        true,
 	}
-	theMC, err := theMarshal.NewMC()
+	var theMC MC
-	theMarshal.Queried = theMC
+	if time.Now().After(p.CollectedMCExpiry) || time.Now().Equal(p.CollectedMCExpiry) {
-	if err != nil {
+		theMC, err = theMarshal.NewMC()
-		theMarshal.Online = false
+		if err == nil {
+			p.CachedMC = &theMC
+		} else {
+			theMarshal.Online = false
+			p.CachedMC = nil
+		}
+		p.CollectedMCExpiry = time.Now().Add(theData.MCQueryInterval)
+	} else {
+		if p.CachedMC == nil {
+			theMC = MC{}
+			theMarshal.Online = false
+		} else {
+			theMC = *p.CachedMC
+		}
 	}
+	theMarshal.Queried = theMC
 	theBuffer := &io.BufferedWriter{}
 	err = theTemplate.ExecuteTemplate(theBuffer, templateName, theMarshal)
 	if err != nil {