baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix rate limiting and SSE

Browse source
This commit is contained in:
Sylvain Rabot 2019-11-12 11:06:05 +01:00 committed by Traefiker Bot
parent 2036518813
commit e6e026f420
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
pkg/middlewares/ratelimiter/rate_limiter.go
View file

@ -5,7 +5,6 @@ import (
"context" "context"
"fmt" "fmt"
"net/http" "net/http"
"sync"
"time" "time"
"github.com/containous/traefik/v2/pkg/config/dynamic" "github.com/containous/traefik/v2/pkg/config/dynamic"
@ -35,8 +34,7 @@ type rateLimiter struct {
sourceMatcher utils.SourceExtractor sourceMatcher utils.SourceExtractor
next http.Handler next http.Handler
bucketsMu sync.Mutex buckets *ttlmap.TtlMap // actual buckets, keyed by source.
buckets *ttlmap.TtlMap // actual buckets, keyed by source.
} }
// New returns a rate limiter middleware. // New returns a rate limiter middleware.
@ -57,7 +55,7 @@ func New(ctx context.Context, next http.Handler, config dynamic.RateLimit, name
return nil, err return nil, err
} }
buckets, err := ttlmap.NewMap(maxSources) buckets, err := ttlmap.NewConcurrent(maxSources)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -104,9 +102,6 @@ func (rl *rateLimiter) ServeHTTP(w http.ResponseWriter, r *http.Request) {
logger.Infof("ignoring token bucket amount > 1: %d", amount) logger.Infof("ignoring token bucket amount > 1: %d", amount)
} }
rl.bucketsMu.Lock()
defer rl.bucketsMu.Unlock()
var bucket *rate.Limiter var bucket *rate.Limiter
if rlSource, exists := rl.buckets.Get(source); exists { if rlSource, exists := rl.buckets.Get(source); exists {
bucket = rlSource.(*rate.Limiter) bucket = rlSource.(*rate.Limiter)