diff --git a/internal/server/server.go b/internal/server/server.go index a42fde4..b754886 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -21,10 +21,12 @@ type Server struct { queries *db.Queries } -func NewServer(queries *db.Queries, logger *slog.Logger) *Server { +func NewServer(queries *db.Queries) *Server { router := chi.NewMux() - router.Use(httplog.RequestLogger(logger, nil)) + router.Use(httplog.RequestLogger(slog.Default(), &httplog.Options{ + RecoverPanics: true, + })) router.Use(middleware.Recoverer) router.Use(middleware.RequestID) router.Use(middleware.RealIP) diff --git a/cmd/server/main.go b/main.go similarity index 94% rename from cmd/server/main.go rename to main.go index 0560d90..2c3f5cb 100644 --- a/cmd/server/main.go +++ b/main.go @@ -21,6 +21,10 @@ type Config struct { var config Config func init() { + gonsoleHandler := gonsole.New(os.Stdout, slog.LevelDebug) + slogHandler := slog.New(gonsoleHandler) + slog.SetDefault(slogHandler) + dotenv.MustLoad() if err := env.Load(&config); err != nil { panic(err) @@ -28,9 +32,6 @@ func init() { } func main() { - gonsoleHandler := gonsole.New(os.Stdout, slog.LevelDebug) - slogHandler := slog.New(gonsoleHandler) - slog.SetDefault(slogHandler) ctx := context.Background() conn, err := pgxpool.New(ctx, config.DatabaseURL) @@ -40,7 +41,7 @@ func main() { } queries := db.New(conn) - server := server.NewServer(queries, slogHandler) + server := server.NewServer(queries) server.Start(config.Port) }