Refactor api to seperate package

2 files changed, 74 insertions, 57 deletions

diff --git a/api/api.go b/api/api.go
new file mode 100644
index 0000000..d735235
--- /dev/null
+++ b/api/api.go
@@ -0,0 +1,70 @@
+package api
+
+import (
+	"context"
+	"encoding/json"
+	"log"
+	"net/http"
+	"os"
+)
+
+var logger *log.Logger
+
+const VTT_URL string = "http://73.188.175.49:30000"
+
+func remoteOnline(ctx context.Context, url string) bool {
+	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
+	if err != nil {
+		panic(err)
+	}
+
+	_, err = http.DefaultClient.Do(req)
+	if err != nil {
+		return false
+	}
+
+	return true
+}
+
+func respondOnline(w http.ResponseWriter, url string, isOnline bool) {
+	data := struct {
+		Online bool   `json:"online"`
+		Site   string `json:"url"`
+	}{isOnline, url}
+
+	jsonData, err := json.Marshal(data)
+	if err != nil {
+		http.Error(w, "Error constructing response", http.StatusInternalServerError)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json")
+	w.Write(jsonData)
+}
+
+func VttOnline(w http.ResponseWriter, req *http.Request) {
+	isOnline := remoteOnline(req.Context(), VTT_URL)
+
+	if !isOnline && logger != nil {
+		logger.Println("Foundry VTT is offline")
+	}
+	respondOnline(w, VTT_URL, isOnline)
+}
+
+func VttRedirect(w http.ResponseWriter, req *http.Request) {
+	http.Redirect(w, req, VTT_URL, http.StatusMovedPermanently)
+}
+
+func SiteOnline(w http.ResponseWriter, req *http.Request) {
+	const URL string = "https://dnd.jpappel.xyz"
+	isOnline := remoteOnline(req.Context(), URL)
+	if !isOnline && logger != nil {
+		logger.Println("Campaign Website is offline")
+	}
+	respondOnline(w, URL, isOnline)
+}
+
+
+func init() {
+    logger = log.New(os.Stdout, "Api: ", log.Ldate | log.Ltime | log.Lshortfile)
+}
diff --git a/nonsense-time.go b/nonsense-time.go
index bbf4932..6c625a1 100644
--- a/nonsense-time.go
+++ b/nonsense-time.go
@@ -2,71 +2,18 @@ package main
 
 import (
 	"context"
-	"encoding/json"
 	"flag"
 	"fmt"
 	"log"
 	"net/http"
 	"os"
 	"time"
+    "nonsense-time/api"
 )
 
-const VTT_URL string = "http://73.188.175.49:30000"
 
 var logger *log.Logger
 
-func remoteOnline(ctx context.Context, url string) bool {
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
-	if err != nil {
-		panic(err)
-	}
-
-	_, err = http.DefaultClient.Do(req)
-	if err != nil {
-		return false
-	}
-
-	return true
-}
-
-func respondOnline(w http.ResponseWriter, url string, isOnline bool) {
-	data := struct {
-		Online bool   `json:"online"`
-		Site   string `json:"url"`
-	}{isOnline, url}
-
-	jsonData, err := json.Marshal(data)
-	if err != nil {
-		http.Error(w, "Error constructing response", http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	w.Write(jsonData)
-}
-
-func vttOnline(w http.ResponseWriter, req *http.Request) {
-	isOnline := remoteOnline(req.Context(), VTT_URL)
-
-	if !isOnline {
-		logger.Println("Foundry VTT is offline")
-	}
-	respondOnline(w, VTT_URL, isOnline)
-}
-
-func vttRedirect(w http.ResponseWriter, req *http.Request) {
-	http.Redirect(w, req, VTT_URL, http.StatusMovedPermanently)
-}
-
-func siteOnline(w http.ResponseWriter, req *http.Request) {
-	const URL string = "https://dnd.jpappel.xyz"
-	isOnline := remoteOnline(req.Context(), URL)
-	if !isOnline {
-		logger.Println("Campaign Website is offline")
-	}
-	respondOnline(w, URL, isOnline)
-}
-
 func timeoutMiddleware(next http.Handler, duration time.Duration) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		ctx, cancel := context.WithTimeout(r.Context(), duration)
@@ -102,11 +49,11 @@ func main() {
 	}
 	logger = log.New(os.Stdout, loggerPrefix, loggerFlags)
 
-	vtt := timeoutMiddleware(http.HandlerFunc(vttOnline), *waitTime)
-	site := timeoutMiddleware(http.HandlerFunc(siteOnline), *waitTime)
+	vtt := timeoutMiddleware(http.HandlerFunc(api.VttOnline), *waitTime)
+	site := timeoutMiddleware(http.HandlerFunc(api.SiteOnline), *waitTime)
 
 	mux.Handle("GET /vtt/status", vtt)
-	mux.HandleFunc("GET /vtt", vttRedirect)
+	mux.HandleFunc("GET /vtt", api.VttRedirect)
 	mux.Handle("GET /site/status", site)
 
 	logger.Println("Listening on ", addr)