From 0474c2dcb675f00c81f3778f4b1a9502bdf3c722 Mon Sep 17 00:00:00 2001
From: Solomon Victorino <git@solomonvictorino.com>
Date: Sat, 5 Apr 2025 15:11:51 -0600
Subject: [PATCH] chore: upgrade to go1.24

---
 handlers/annotations.go |  6 +++---
 handlers/proxy.go       |  2 +-
 main.go                 |  4 ++--
 utils/logger.go         | 20 ++++++++++++++++----
 utils/template.go       |  2 +-
 5 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/handlers/annotations.go b/handlers/annotations.go
index 827074a..4c3fb3a 100644
--- a/handlers/annotations.go
+++ b/handlers/annotations.go
@@ -47,7 +47,7 @@ func annotations(l *utils.Logger) http.HandlerFunc {
 		buf := new(bytes.Buffer)
 		_, err = buf.ReadFrom(resp.Body)
 		if err != nil {
-			l.Error("Error paring genius api response: %s", err.Error())
+			l.Errorf("Error paring genius api response: %s", err.Error())
 			w.WriteHeader(http.StatusInternalServerError)
 			utils.RenderTemplate(w, views.ErrorPage(500, "something went wrong"), l)
 			return
@@ -56,7 +56,7 @@ func annotations(l *utils.Logger) http.HandlerFunc {
 		var data data.AnnotationsResponse
 		err = json.Unmarshal(buf.Bytes(), &data)
 		if err != nil {
-			l.Error("could not unmarshal json: %s\n", err)
+			l.Errorf("could not unmarshal json: %s\n", err)
 			w.WriteHeader(http.StatusInternalServerError)
 			utils.RenderTemplate(w, views.ErrorPage(500, "something went wrong"), l)
 			return
@@ -69,7 +69,7 @@ func annotations(l *utils.Logger) http.HandlerFunc {
 		encoder := json.NewEncoder(w)
 
 		if err = encoder.Encode(&annotation); err != nil {
-			l.Error("Error sending response: %s", err.Error())
+			l.Errorf("Error sending response: %s", err.Error())
 			return
 		}
 
diff --git a/handlers/proxy.go b/handlers/proxy.go
index 6eae13c..41ec0b2 100644
--- a/handlers/proxy.go
+++ b/handlers/proxy.go
@@ -58,7 +58,7 @@ func imageProxy(l *utils.Logger) http.HandlerFunc {
 		w.Header().Set("Content-type", mime.TypeByExtension("."+ext))
 		w.Header().Add("Cache-Control", "max-age=1296000")
 		if _, err = io.Copy(w, res.Body); err != nil {
-			l.Error("unable to write image, %s", err.Error())
+			l.Errorf("unable to write image, %s", err.Error())
 		}
 	}
 }
diff --git a/main.go b/main.go
index 872745f..0576608 100644
--- a/main.go
+++ b/main.go
@@ -39,7 +39,7 @@ func main() {
 
 	if port == 0 {
 		port = 5555
-		logger.Info("using default port %d", port)
+		logger.Infof("using default port %d", port)
 	}
 
 	l, err := net.Listen("tcp", fmt.Sprintf(":%d", port))
@@ -47,7 +47,7 @@ func main() {
 		logger.Fatal(err.Error())
 	}
 
-	logger.Info("server is listening on port %d", port)
+	logger.Infof("server is listening on port %d", port)
 
 	if err := server.Serve(l); err != nil {
 		logger.Fatal(err.Error())
diff --git a/utils/logger.go b/utils/logger.go
index 1d190f5..f604bc8 100644
--- a/utils/logger.go
+++ b/utils/logger.go
@@ -18,15 +18,27 @@ func NewLogger(w io.WriteCloser) *Logger {
 	return &Logger{slog: sl}
 }
 
-func (l *Logger) Error(f string, args ...any) {
+func (l *Logger) Errorf(f string, args ...any) {
 	l.slog.Error(fmt.Sprintf(f, args...))
 }
 
-func (l *Logger) Info(f string, args ...any) {
+func (l *Logger) Error(e string) {
+	l.Errorf("%s", e)
+}
+
+func (l *Logger) Infof(f string, args ...any) {
 	l.slog.Info(fmt.Sprintf(f, args...))
 }
 
-func (l *Logger) Fatal(f string, args ...any) {
-	l.Error(f, args...)
+func (l *Logger) Info(m string) {
+	l.Infof("%s", m)
+}
+
+func (l *Logger) Fatalf(f string, args ...any) {
+	l.Errorf(f, args...)
 	os.Exit(1)
 }
+
+func (l *Logger) Fatal(e string) {
+	l.Fatalf("%s", e)
+}
diff --git a/utils/template.go b/utils/template.go
index 91c8bb7..a239546 100644
--- a/utils/template.go
+++ b/utils/template.go
@@ -9,7 +9,7 @@ import (
 
 func RenderTemplate(w http.ResponseWriter, t templ.Component, l *Logger) {
 	if err := t.Render(context.Background(), w); err != nil {
-		l.Error("unable to render template %s", err)
+		l.Errorf("unable to render template %s", err)
 		w.WriteHeader(http.StatusInternalServerError)
 		_, err := w.Write([]byte{})
 		if err != nil {