@@ -100,6 +100,7 @@ type Container struct {
100100 contactRistrettoCache * ristretto.Cache [string , services.ContactCacheEntry ]
101101 inMemoryCache cache.Cache
102102 rateLimitService * services.RateLimitService
103+ rateLimitMiddleware fiber.Handler
103104 redisClient * redis.Client
104105 rateLimitRedisClient * redis.Client
105106 closeOnce sync.Once
@@ -115,13 +116,13 @@ func NewLiteContainer() (container *Container) {
115116// Close gracefully shuts down container resources
116117func (container * Container ) Close () {
117118 container .closeOnce .Do (func () {
118- if container .rateLimitService != nil {
119- container .rateLimitService .Close ()
120- }
121119 if container .rateLimitRedisClient != nil {
120+ container .logger .Info ("closing rate limit Redis client after HTTP shutdown" )
122121 if err := container .rateLimitRedisClient .Close (); err != nil {
123122 container .logger .Error (stacktrace .Propagatef (err , "cannot close rate limit Redis client" ))
123+ return
124124 }
125+ container .logger .Info ("rate limit Redis client shutdown complete" )
125126 }
126127 })
127128}
@@ -229,13 +230,6 @@ func (container *Container) App() (app *fiber.App) {
229230 app .Use (middlewares .APIKeyAuth (container .Logger (), container .Tracer (), container .UserRepository ()))
230231
231232 if os .Getenv ("RATE_LIMIT_ENABLED" ) == "true" {
232- app .Use (middlewares .RateLimit (
233- container .Tracer (),
234- container .Logger (),
235- container .RateLimitService (),
236- container .UserRepository (),
237- []string {"/v1/events" },
238- ))
239233 app .Hooks ().OnPreShutdown (func () error {
240234 container .logger .Info ("rate limit shutdown waiting for HTTP requests to drain" )
241235 return nil
@@ -268,7 +262,17 @@ func (container *Container) PhoneAPIKeyMiddleware() fiber.Handler {
268262// AuthenticatedMiddleware creates a new instance of middlewares.Authenticated
269263func (container * Container ) AuthenticatedMiddleware () fiber.Handler {
270264 container .logger .Debug ("creating middlewares.Authenticated" )
271- return middlewares .Authenticated (container .Tracer ())
265+ var limiter fiber.Handler
266+ if os .Getenv ("RATE_LIMIT_ENABLED" ) == "true" {
267+ if container .rateLimitMiddleware == nil {
268+ container .rateLimitMiddleware = middlewares .RateLimit (
269+ container .Tracer (), container .Logger (), container .RateLimitService (),
270+ container .UserRepository (), []string {"/v1/events" },
271+ )
272+ }
273+ limiter = container .rateLimitMiddleware
274+ }
275+ return middlewares .Authenticated (container .Tracer (), limiter )
272276}
273277
274278// Logger creates a new instance of telemetry.Logger
@@ -551,7 +555,6 @@ func (container *Container) RateLimitService() *services.RateLimitService {
551555 container .Tracer (),
552556 container .Logger (),
553557 container .rateLimitRedisClient ,
554- container .EventDispatcher (),
555558 )
556559 return container .rateLimitService
557560}
0 commit comments