refactor(log): replace stdlib log with the application JSON logger
Every log.Printf/Fatalf becomes a structured slog call through internal/log: request handlers use the request-scoped logger (applog.FromContext, carrying request_id), startup failures exit via a fatal() helper that still emits JSON, and the seedsample/dumpschema CLIs bootstrap the same JSON logger. Stale client_test expectations aligned with the refactored wrapper-call logging (message casing, result attr, ERROR level). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -5,7 +5,6 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"log"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
@@ -17,30 +16,42 @@ import (
|
||||
"geniusrun/backend/internal/auth"
|
||||
"geniusrun/backend/internal/config"
|
||||
"geniusrun/backend/internal/garmin"
|
||||
"geniusrun/backend/internal/log"
|
||||
applog "geniusrun/backend/internal/log"
|
||||
"geniusrun/backend/internal/store"
|
||||
)
|
||||
|
||||
// fatal logs through the application JSON logger and exits -- the
|
||||
// structured replacement for log.Fatalf, so even startup failures come
|
||||
// out as JSON lines.
|
||||
func fatal(msg string, err error) {
|
||||
slog.Error(msg, "error", err)
|
||||
os.Exit(1)
|
||||
}
|
||||
|
||||
func main() {
|
||||
// Bootstrap logger at info so failures loading the env config itself
|
||||
// (which carries the real log level) are still emitted as JSON.
|
||||
slog.SetDefault(applog.NewLogger("info", os.Stdout))
|
||||
|
||||
envCfg, err := config.LoadEnv()
|
||||
if err != nil {
|
||||
log.Fatalf("config: %v", err)
|
||||
fatal("load env config", err)
|
||||
}
|
||||
slog.SetDefault(applog.NewLogger(envCfg.LogLevel, os.Stdout))
|
||||
|
||||
db, err := store.Open(envCfg.DBPath)
|
||||
if err != nil {
|
||||
log.Fatalf("open database: %v", err)
|
||||
fatal("open database", err)
|
||||
}
|
||||
defer db.Close()
|
||||
|
||||
overrides, err := db.ConfigValues(context.Background())
|
||||
if err != nil {
|
||||
log.Fatalf("app config: %v", err)
|
||||
fatal("read app config overrides", err)
|
||||
}
|
||||
appCfg, err := config.LoadApp(overrides)
|
||||
if err != nil {
|
||||
log.Fatalf("app config: %v", err)
|
||||
fatal("load app config", err)
|
||||
}
|
||||
|
||||
authVerifier, err := auth.NewOIDCVerifier(context.Background(), auth.OIDCConfig{
|
||||
@@ -51,7 +62,7 @@ func main() {
|
||||
RequiredRole: envCfg.OIDCRequiredRole,
|
||||
})
|
||||
if err != nil {
|
||||
log.Fatalf("oidc: %v", err)
|
||||
fatal("oidc verifier setup", err)
|
||||
}
|
||||
|
||||
server := api.NewServer(
|
||||
@@ -80,17 +91,17 @@ func main() {
|
||||
|
||||
httpServer := &http.Server{Addr: envCfg.BackendAddr, Handler: server.Router()}
|
||||
go func() {
|
||||
log.Printf("geniusrund listening on %s", envCfg.BackendAddr)
|
||||
slog.Info("geniusrund listening", "addr", envCfg.BackendAddr)
|
||||
if err := httpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
|
||||
log.Fatalf("http server: %v", err)
|
||||
fatal("http server", err)
|
||||
}
|
||||
}()
|
||||
|
||||
<-ctx.Done()
|
||||
log.Println("shutting down...")
|
||||
slog.Info("shutting down")
|
||||
shutdownCtx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
|
||||
defer cancel()
|
||||
if err := httpServer.Shutdown(shutdownCtx); err != nil {
|
||||
log.Printf("http server shutdown: %v", err)
|
||||
slog.Error("http server shutdown", "error", err)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user