From e8d9040688925304edad469d92518da84e1b8d96 Mon Sep 17 00:00:00 2001 From: JP Appel Date: Wed, 2 Oct 2024 13:59:28 -0400 Subject: Refactor loging to use slog --- api/api.go | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'api/api.go') diff --git a/api/api.go b/api/api.go index d735235..3e0dc27 100644 --- a/api/api.go +++ b/api/api.go @@ -3,12 +3,12 @@ package api import ( "context" "encoding/json" - "log" + "log/slog" "net/http" "os" ) -var logger *log.Logger +var Logger *slog.Logger const VTT_URL string = "http://73.188.175.49:30000" @@ -35,6 +35,7 @@ func respondOnline(w http.ResponseWriter, url string, isOnline bool) { jsonData, err := json.Marshal(data) if err != nil { http.Error(w, "Error constructing response", http.StatusInternalServerError) + Logger.Error("Error marshalling site status data") return } @@ -45,8 +46,8 @@ func respondOnline(w http.ResponseWriter, url string, isOnline bool) { func VttOnline(w http.ResponseWriter, req *http.Request) { isOnline := remoteOnline(req.Context(), VTT_URL) - if !isOnline && logger != nil { - logger.Println("Foundry VTT is offline") + if !isOnline { + Logger.DebugContext(req.Context(), "Foundry VTT is offline") } respondOnline(w, VTT_URL, isOnline) } @@ -57,14 +58,15 @@ func VttRedirect(w http.ResponseWriter, req *http.Request) { 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") + if !isOnline { + Logger.DebugContext(req.Context(), "Campaign Website is offline") } + respondOnline(w, URL, isOnline) } - func init() { - logger = log.New(os.Stdout, "Api: ", log.Ldate | log.Ltime | log.Lshortfile) + Logger = slog.New(slog.NewTextHandler(os.Stdout, nil)) } -- cgit v1.2.3