feat: use http.Error in responses

Signed-off-by: Matt Gleich <[email protected]>
gleich · Jan 8, 2025 · 0257dba · 0257dba
1 parent e32d2af
commit 0257dba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/internal/apis/applemusic/applemusic.go b/internal/apis/applemusic/applemusic.go
@@ -2,6 +2,7 @@ package applemusic
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"time"
 
@@ -108,8 +109,9 @@ func serveHTTP(c *cache.Cache[cacheData]) http.HandlerFunc {
 			Encode(cache.CacheResponse[cacheDataResponse]{Data: data, Updated: c.Updated})
 		c.DataMutex.RUnlock()
 		if err != nil {
-			lumber.Error(err, "failed to write json data to request")
-			w.WriteHeader(http.StatusInternalServerError)
+			err = fmt.Errorf("%v failed to write json data to request", err)
+			lumber.Error(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
 		}
 	})
 }
diff --git a/internal/apis/applemusic/playlists.go b/internal/apis/applemusic/playlists.go
@@ -119,8 +119,9 @@ func playlistEndpoint(c *cache.Cache[cacheData]) http.HandlerFunc {
 		err := json.NewEncoder(w).Encode(p)
 		c.DataMutex.RUnlock()
 		if err != nil {
-			lumber.Error(err, "failed to write json data to request")
-			w.WriteHeader(http.StatusInternalServerError)
+			err = fmt.Errorf("%v failed to write json data to request", err)
+			lumber.Error(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
 		}
 	})
 }
diff --git a/internal/cache/cache.go b/internal/cache/cache.go
@@ -50,8 +50,9 @@ func (c *Cache[T]) ServeHTTP() http.HandlerFunc {
 		err := json.NewEncoder(w).Encode(CacheResponse[T]{Data: c.Data, Updated: c.Updated})
 		c.DataMutex.RUnlock()
 		if err != nil {
-			lumber.Error(err, "failed to write json data to request")
-			w.WriteHeader(http.StatusInternalServerError)
+			err = fmt.Errorf("%v failed to write json data to request", err)
+			lumber.Error(err)
+			http.Error(w, err.Error(), http.StatusInternalServerError)
 		}
 	})
 }