consolidated osversion functions to osversion.go

2 files changed, 28 insertions, 26 deletions

diff --git a/cache.go b/cache.go
index 24744f6..c7a68b7 100644
--- a/cache.go
+++ b/cache.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"io/ioutil"
 	"log"
 	"strings"
@@ -117,29 +116,6 @@ func bapIndex() {
 	}
 }
 
-func bapOSVersion(format string) {
-	path := fmt.Sprintf("/%s/osversion", format)
-	unNullPage(path)
-
-	if cache.isFresh(path) {
-		return
-	}
-
-	bytes, err := osVersionQuery(format)
-	if err != nil {
-		log.Printf("Could not query OS version: %s", err.Error())
-		bytes = []byte("Internal Error")
-	}
-
-	cache.Lock()
-	defer cache.Unlock()
-
-	cache.pages[path] = &page{
-		raw:     bytes,
-		expires: time.Now().Add(cacheDuration),
-	}
-}
-
 func bapPkgs(format string)      {}
 func bapQuery(format string)     {}
 func bapUptime(format string)    {}
diff --git a/osversion.go b/osversion.go
index 6ecac9a..eadc960 100644
--- a/osversion.go
+++ b/osversion.go
@@ -3,12 +3,38 @@ package main
 import (
 	"errors"
 	"fmt"
+	"log"
 	"os/exec"
 	"strings"
+	"time"
 )
 
-// osVersionQuery handles the /<format>/osversion endpoint.
-// Responds with the OpenBSD version.
+// Checks the cache for the freshness of the osversion query.
+// If stale, store the query again.
+func bapOSVersion(format string) {
+	path := fmt.Sprintf("/%s/osversion", format)
+	unNullPage(path)
+
+	if cache.isFresh(path) {
+		return
+	}
+
+	bytes, err := osVersionQuery(format)
+	if err != nil {
+		log.Printf("Could not query OS version: %s", err.Error())
+		bytes = []byte("Internal Error")
+	}
+
+	cache.Lock()
+	defer cache.Unlock()
+
+	cache.pages[path] = &page{
+		raw:     bytes,
+		expires: time.Now().Add(cacheDuration),
+	}
+}
+
+// executes uname and responds with "$OS $VERSION" in []byte{}
 func osVersionQuery(format string) ([]byte, error) {
 	out, err := exec.Command("/usr/bin/uname", "-a").Output()
 	if err != nil {