Resync oxy with original repository
This commit is contained in:
parent
da5e4a13bf
commit
bee8ebb00b
31 changed files with 650 additions and 808 deletions
17
vendor/github.com/vulcand/oxy/ratelimit/tokenlimiter.go
generated
vendored
17
vendor/github.com/vulcand/oxy/ratelimit/tokenlimiter.go
generated
vendored
|
@ -7,6 +7,7 @@ import (
|
|||
"sync"
|
||||
"time"
|
||||
|
||||
log "github.com/Sirupsen/logrus"
|
||||
"github.com/mailgun/timetools"
|
||||
"github.com/mailgun/ttlmap"
|
||||
"github.com/vulcand/oxy/utils"
|
||||
|
@ -65,7 +66,6 @@ type TokenLimiter struct {
|
|||
mutex sync.Mutex
|
||||
bucketSets *ttlmap.TtlMap
|
||||
errHandler utils.ErrorHandler
|
||||
log utils.Logger
|
||||
capacity int
|
||||
next http.Handler
|
||||
}
|
||||
|
@ -110,7 +110,7 @@ func (tl *TokenLimiter) ServeHTTP(w http.ResponseWriter, req *http.Request) {
|
|||
}
|
||||
|
||||
if err := tl.consumeRates(req, source, amount); err != nil {
|
||||
tl.log.Infof("limiting request %v %v, limit: %v", req.Method, req.URL, err)
|
||||
log.Infof("limiting request %v %v, limit: %v", req.Method, req.URL, err)
|
||||
tl.errHandler.ServeHTTP(w, req, err)
|
||||
return
|
||||
}
|
||||
|
@ -155,7 +155,7 @@ func (tl *TokenLimiter) resolveRates(req *http.Request) *RateSet {
|
|||
|
||||
rates, err := tl.extractRates.Extract(req)
|
||||
if err != nil {
|
||||
tl.log.Errorf("Failed to retrieve rates: %v", err)
|
||||
log.Errorf("Failed to retrieve rates: %v", err)
|
||||
return tl.defaultRates
|
||||
}
|
||||
|
||||
|
@ -190,14 +190,6 @@ func (e *RateErrHandler) ServeHTTP(w http.ResponseWriter, req *http.Request, err
|
|||
|
||||
type TokenLimiterOption func(l *TokenLimiter) error
|
||||
|
||||
// Logger sets the logger that will be used by this middleware.
|
||||
func Logger(l utils.Logger) TokenLimiterOption {
|
||||
return func(cl *TokenLimiter) error {
|
||||
cl.log = l
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
// ErrorHandler sets error handler of the server
|
||||
func ErrorHandler(h utils.ErrorHandler) TokenLimiterOption {
|
||||
return func(cl *TokenLimiter) error {
|
||||
|
@ -233,9 +225,6 @@ func Capacity(cap int) TokenLimiterOption {
|
|||
var defaultErrHandler = &RateErrHandler{}
|
||||
|
||||
func setDefaults(tl *TokenLimiter) {
|
||||
if tl.log == nil {
|
||||
tl.log = utils.NullLogger
|
||||
}
|
||||
if tl.capacity <= 0 {
|
||||
tl.capacity = DefaultCapacity
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue