Skip to content
Open
Show file tree
Hide file tree
Changes from 12 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions auth-service/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (

"github.com/hmchangw/chat/pkg/ginutil"
pkgoidc "github.com/hmchangw/chat/pkg/oidc"
"github.com/hmchangw/chat/pkg/otelutil"
"github.com/hmchangw/chat/pkg/shutdown"
)

Expand All @@ -24,6 +25,7 @@ type config struct {
AuthAccountPubKey string `env:"AUTH_ACCOUNT_PUB_KEY,required"`
NATSJWTExpiry time.Duration `env:"NATS_JWT_EXPIRY" envDefault:"2h"`
NATSJWTExpiryJitter float64 `env:"NATS_JWT_EXPIRY_JITTER" envDefault:"0.1"`
MetricsAddr string `env:"METRICS_ADDR" envDefault:":9090"`

// OIDC settings — required when DEV_MODE is false.
OIDCIssuerURL string `env:"OIDC_ISSUER_URL"`
Expand Down Expand Up @@ -88,10 +90,17 @@ func run() error {
r := gin.New()
r.Use(gin.Recovery())
r.Use(ginutil.RequestID())
r.Use(ginutil.Metrics("auth-service"))
r.Use(ginutil.AccessLog())
r.Use(ginutil.CORS())
registerRoutes(r, handler)

// /metrics on a separate port so scrapes don't hit the public API listener.
stopMetrics, err := otelutil.ServeMetrics(cfg.MetricsAddr)
if err != nil {
return err
}

addr := fmt.Sprintf(":%s", cfg.Port)
srv := &http.Server{
Addr: addr,
Expand All @@ -109,10 +118,13 @@ func run() error {
shutdownDone := make(chan struct{})
go func() {
defer close(shutdownDone)
shutdown.Wait(ctx, 25*time.Second, func(ctx context.Context) error {
slog.Info("shutting down auth service")
return srv.Shutdown(ctx)
})
shutdown.Wait(ctx, 25*time.Second,
func(ctx context.Context) error {
slog.Info("shutting down auth service")
return srv.Shutdown(ctx)
},
func(ctx context.Context) error { return stopMetrics(ctx) },
)
}()

err = <-srvErr
Expand Down
Loading