ngn/dumb
1
0
Fork 0
Code Issues 1 Pull Requests 3 Actions Packages Activity

chore: upgrade to go1.24

Browse Source
This commit is contained in:
Solomon Victorino 2025-04-05 15:11:51 -06:00 committed by ngn
parent 50784a6ab5
commit 0474c2dcb6
Signed by: ngn
GPG Key ID: A3654DF5AD9F641D
5 changed files with 23 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
handlers/annotations.go
View File

@ -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
}

2
handlers/proxy.go
View File

@ -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())
}
}
}

4
main.go
View File

@ -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())

20
utils/logger.go
View File

@ -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)
}

2
utils/template.go
View File

@ -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 {