mirror of
https://github.com/jeremyd/ergo.git
synced 2026-05-03 02:49:59 -07:00
review feedback: rename a key
This commit is contained in:
@@ -33,7 +33,7 @@ type customLimit struct {
|
||||
// rawLimiterConfig contains all the YAML-visible fields;
|
||||
// LimiterConfig contains additional denormalized private fields
|
||||
type rawLimiterConfig struct {
|
||||
Limit bool
|
||||
Count bool
|
||||
MaxConcurrent int `yaml:"max-concurrent-connections"`
|
||||
|
||||
Throttle bool
|
||||
@@ -156,7 +156,7 @@ func (cl *Limiter) AddClient(addr net.IP) error {
|
||||
}
|
||||
|
||||
// now check limiter
|
||||
if cl.config.Limit {
|
||||
if cl.config.Count {
|
||||
count := cl.limiter[addrString] + 1
|
||||
if count > maxConcurrent {
|
||||
return ErrLimitExceeded
|
||||
@@ -172,7 +172,7 @@ func (cl *Limiter) RemoveClient(addr net.IP) {
|
||||
cl.Lock()
|
||||
defer cl.Unlock()
|
||||
|
||||
if !cl.config.Limit || utils.IPInNets(addr, cl.config.exemptedNets) {
|
||||
if !cl.config.Count || utils.IPInNets(addr, cl.config.exemptedNets) {
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ func easyParseIP(ipstr string) (result net.IP) {
|
||||
|
||||
var baseConfig = LimiterConfig{
|
||||
rawLimiterConfig: rawLimiterConfig{
|
||||
Limit: true,
|
||||
Count: true,
|
||||
MaxConcurrent: 4,
|
||||
|
||||
Throttle: true,
|
||||
|
||||
@@ -67,7 +67,7 @@ func makeTestThrottler(v4len, v6len int) *Limiter {
|
||||
maxConnections := 3
|
||||
config := LimiterConfig{
|
||||
rawLimiterConfig: rawLimiterConfig{
|
||||
Limit: false,
|
||||
Count: false,
|
||||
Throttle: true,
|
||||
CidrLenIPv4: v4len,
|
||||
CidrLenIPv6: v6len,
|
||||
|
||||
Reference in New Issue
Block a user