Fix SSE architecture for reliable connections (#13)
This commit was merged in pull request #13.
This commit is contained in:
28
main.go
28
main.go
@@ -2,7 +2,6 @@ package main
|
||||
|
||||
import (
|
||||
"context"
|
||||
"embed"
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net"
|
||||
@@ -11,6 +10,12 @@ import (
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/go-chi/chi/v5/middleware"
|
||||
"github.com/rs/zerolog/log"
|
||||
slogzerolog "github.com/samber/slog-zerolog/v2"
|
||||
"golang.org/x/sync/errgroup"
|
||||
|
||||
"github.com/ryanhamamura/games/config"
|
||||
"github.com/ryanhamamura/games/connect4"
|
||||
"github.com/ryanhamamura/games/db"
|
||||
@@ -21,22 +26,19 @@ import (
|
||||
"github.com/ryanhamamura/games/sessions"
|
||||
"github.com/ryanhamamura/games/snake"
|
||||
"github.com/ryanhamamura/games/version"
|
||||
|
||||
"github.com/go-chi/chi/v5"
|
||||
"github.com/go-chi/chi/v5/middleware"
|
||||
"github.com/rs/zerolog/log"
|
||||
"golang.org/x/sync/errgroup"
|
||||
)
|
||||
|
||||
//go:embed assets
|
||||
var assets embed.FS
|
||||
|
||||
func main() {
|
||||
ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
|
||||
defer cancel()
|
||||
|
||||
cfg := config.Global
|
||||
logging.SetupLogger(cfg.Environment, cfg.LogLevel)
|
||||
zerologLogger := logging.SetupLogger(cfg.Environment, cfg.LogLevel)
|
||||
slog.SetDefault(slog.New(slogzerolog.Option{
|
||||
Level: slogzerolog.ZeroLogLeveler{Logger: zerologLogger},
|
||||
Logger: zerologLogger,
|
||||
NoTimestamp: true,
|
||||
}.NewZerologHandler()))
|
||||
|
||||
if err := run(ctx); err != nil && err != http.ErrServerClosed {
|
||||
log.Fatal().Err(err).Msg("server error")
|
||||
@@ -91,7 +93,7 @@ func run(ctx context.Context) error {
|
||||
sessionManager.LoadAndSave,
|
||||
)
|
||||
|
||||
router.SetupRoutes(r, queries, sessionManager, nc, store, snakeStore, assets)
|
||||
router.SetupRoutes(r, queries, sessionManager, nc, store, snakeStore)
|
||||
|
||||
// HTTP server
|
||||
srv := &http.Server{
|
||||
@@ -101,6 +103,10 @@ func run(ctx context.Context) error {
|
||||
BaseContext: func(l net.Listener) context.Context {
|
||||
return egctx
|
||||
},
|
||||
ErrorLog: slog.NewLogLogger(
|
||||
slog.Default().Handler(),
|
||||
slog.LevelError,
|
||||
),
|
||||
}
|
||||
|
||||
eg.Go(func() error {
|
||||
|
||||
Reference in New Issue
Block a user