support bandwith limit for one proxy

This commit is contained in:
fatedier
2019-11-03 01:20:49 +08:00
parent 22a79710d8
commit 6da093a402
8 changed files with 262 additions and 13 deletions

View File

@@ -125,6 +125,11 @@ type BaseProxyConf struct {
// values include "v1", "v2", and "". If the value is "", a protocol
// version will be automatically selected. By default, this value is "".
ProxyProtocolVersion string `json:"proxy_protocol_version"`
// BandwithLimit limit the proxy bandwith
// 0 means no limit
BandwithLimit BandwithQuantity `json:"bandwith_limit"`
LocalSvrConf
HealthCheckConf
}
@@ -140,7 +145,8 @@ func (cfg *BaseProxyConf) compare(cmp *BaseProxyConf) bool {
cfg.UseCompression != cmp.UseCompression ||
cfg.Group != cmp.Group ||
cfg.GroupKey != cmp.GroupKey ||
cfg.ProxyProtocolVersion != cmp.ProxyProtocolVersion {
cfg.ProxyProtocolVersion != cmp.ProxyProtocolVersion ||
cfg.BandwithLimit.Equal(&cmp.BandwithLimit) {
return false
}
if !cfg.LocalSvrConf.compare(&cmp.LocalSvrConf) {
@@ -165,6 +171,7 @@ func (cfg *BaseProxyConf) UnmarshalFromIni(prefix string, name string, section i
var (
tmpStr string
ok bool
err error
)
cfg.ProxyName = prefix + name
cfg.ProxyType = section["type"]
@@ -183,11 +190,15 @@ func (cfg *BaseProxyConf) UnmarshalFromIni(prefix string, name string, section i
cfg.GroupKey = section["group_key"]
cfg.ProxyProtocolVersion = section["proxy_protocol_version"]
if err := cfg.LocalSvrConf.UnmarshalFromIni(prefix, name, section); err != nil {
if cfg.BandwithLimit, err = NewBandwithQuantity(section["bandwidth_limit"]); err != nil {
return err
}
if err := cfg.HealthCheckConf.UnmarshalFromIni(prefix, name, section); err != nil {
if err = cfg.LocalSvrConf.UnmarshalFromIni(prefix, name, section); err != nil {
return err
}
if err = cfg.HealthCheckConf.UnmarshalFromIni(prefix, name, section); err != nil {
return err
}

100
models/config/types.go Normal file
View File

@@ -0,0 +1,100 @@
// Copyright 2019 fatedier, fatedier@gmail.com
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package config
import (
"errors"
"strconv"
"strings"
)
const (
MB = 1024 * 1024
KB = 1024
)
type BandwithQuantity struct {
s string // MB or KB
i int64 // bytes
}
func NewBandwithQuantity(s string) (BandwithQuantity, error) {
q := BandwithQuantity{}
err := q.UnmarshalString(s)
if err != nil {
return q, err
}
return q, nil
}
func (q *BandwithQuantity) Equal(u *BandwithQuantity) bool {
if q == nil && u == nil {
return true
}
if q != nil && u != nil {
return q.i == u.i
}
return false
}
func (q *BandwithQuantity) String() string {
return q.s
}
func (q *BandwithQuantity) UnmarshalString(s string) error {
q.s = strings.TrimSpace(s)
if q.s == "" {
return nil
}
var (
base int64
f float64
err error
)
if strings.HasSuffix(s, "MB") {
base = MB
s = strings.TrimSuffix(s, "MB")
f, err = strconv.ParseFloat(s, 64)
if err != nil {
return err
}
} else if strings.HasSuffix(s, "KB") {
base = KB
s = strings.TrimSuffix(s, "KB")
f, err = strconv.ParseFloat(s, 64)
if err != nil {
return err
}
} else {
return errors.New("unit not support")
}
q.i = int64(f * float64(base))
return nil
}
func (q *BandwithQuantity) UnmarshalJSON(b []byte) error {
return q.UnmarshalString(string(b))
}
func (q *BandwithQuantity) MarshalJSON() ([]byte, error) {
return []byte(q.s), nil
}
func (q *BandwithQuantity) Bytes() int64 {
return q.i
}