use slog in web server

ilius · Oct 5, 2024 · 37f6717 · 37f6717
1 parent b955d48
commit 37f6717
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/pkg/server/fs_http.go b/pkg/server/fs_http.go
@@ -2,7 +2,7 @@ package server
 
 import (
  "embed"
- "log"
+ "log/slog"
  "net/http"
  "os"
  "strings"
@@ -20,12 +20,12 @@ func (f *httpFileSystem) Open(name string) (http.File, error) {
  }
  file, err := f.fs.Open(name)
  if err != nil {
- log.Println(err)
+ slog.Error("error opening file", "err", err, "name", name)
  return nil, err
  }
  file2, ok := file.(localFile)
  if !ok {
- log.Printf("file %#v is not a seeker", name)
+ slog.Error("file is not a seeker", "name", name)
  return nil, os.ErrNotExist
  }
  return &httpFile{file2}, nil

diff --git a/pkg/server/server.go b/pkg/server/server.go
@@ -3,7 +3,7 @@ package server
 import (
  "encoding/json"
  "io"
- "log"
+ "log/slog"
  "net/http"
  "os"
  "text/template"
@@ -52,7 +52,7 @@ type Result struct {
 func writeMsg(w http.ResponseWriter, msg string) {
  _, err := w.Write([]byte(msg))
  if err != nil {
- log.Println("error in Write:", err)
+ slog.Error("error in Write", "err", err)
  }
 }
 
@@ -71,7 +71,7 @@ func query(w http.ResponseWriter, r *http.Request) {
  if query == "" {
  err := jsonEncoder.Encode(ErrorResponse{Error: "missing query"})
  if err != nil {
- log.Println(err)
+ slog.Error("error in jsonEncoder.Encode", "err", err)
  }
  w.WriteHeader(http.StatusBadRequest)
  return
@@ -94,13 +94,13 @@ func query(w http.ResponseWriter, r *http.Request) {
  }
  // entry.ResourceDir()
  }
- log.Printf("LookupHTML took %v for %#v", time.Since(t), query)
+ slog.Info("LookupHTML running time", "dt", time.Since(t), "query", query)
  err := jsonEncoder.Encode(results)
  if err != nil {
- log.Println(err)
+ slog.Error("error in jsonEncoder.Encode", "err", err)
  err2 := jsonEncoder.Encode(ErrorResponse{Error: err.Error()})
  if err2 != nil {
- log.Println(err2)
+ slog.Error("error in jsonEncoder.Encode", "err2", err2)
  }
  w.WriteHeader(http.StatusInternalServerError)
  return
@@ -120,10 +120,10 @@ func random(w http.ResponseWriter, r *http.Request) {
  Score: entry.Score(),
  })
  if err != nil {
- log.Println(err)
+ slog.Error("error in jsonEncoder.Encode", "err", err)
  err2 := jsonEncoder.Encode(ErrorResponse{Error: err.Error()})
  if err2 != nil {
- log.Println(err2)
+ slog.Error("error in jsonEncoder.Encode", "err2", err2)
  }
  w.WriteHeader(http.StatusInternalServerError)
  return
@@ -212,7 +212,7 @@ func StartServer(port string) {
  addWebHandlers()
  }
 
- log.Println("Starting local server on port", port)
+ slog.Info("Starting local server", "port", port)
  addr := "127.0.0.1:" + port
  if conf.WebExpose {
  addr = ":" + port