TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-04 07:34:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

反向代理中源站增加最大连接数、连接超时时间等参数

Browse Source
This commit is contained in:
GoEdgeLab
2021-03-25 21:17:59 +08:00
parent 8792aabce6
commit 73dbf38448
2 changed files with 121 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
internal/db/models/origin_dao.go
View File

@@ -86,12 +86,45 @@ func (this *OriginDAO) FindOriginName(tx *dbs.Tx, id int64) (string, error) {
}
// 创建源站
func (this *OriginDAO) CreateOrigin(tx *dbs.Tx, adminId int64, userId int64, name string, addrJSON string, description string, weight int32, isOn bool) (originId int64, err error) {
func (this *OriginDAO) CreateOrigin(tx *dbs.Tx, adminId int64, userId int64, name string, addrJSON string, description string, weight int32, isOn bool, connTimeout *shared.TimeDuration, readTimeout *shared.TimeDuration, idleTimeout *shared.TimeDuration, maxConns int32, maxIdleConns int32) (originId int64, err error) {
op := NewOriginOperator()
op.AdminId = adminId
op.UserId = userId
op.IsOn = isOn
op.Name = name
if connTimeout != nil {
connTimeoutJSON, err := connTimeout.AsJSON()
if err != nil {
return 0, err
}
op.ConnTimeout = connTimeoutJSON
}
if readTimeout != nil {
readTimeoutJSON, err := readTimeout.AsJSON()
if err != nil {
return 0, err
}
op.ReadTimeout = readTimeoutJSON
}
if idleTimeout != nil {
idleTimeoutJSON, err := idleTimeout.AsJSON()
if err != nil {
return 0, err
}
op.IdleTimeout = idleTimeoutJSON
}
if maxConns >= 0 {
op.MaxConns = maxConns
} else {
op.MaxConns = 0
}
if maxIdleConns >= 0 {
op.MaxIdleConns = maxIdleConns
} else {
op.MaxIdleConns = 0
}
op.Addr = addrJSON
op.Description = description
if weight < 0 {
@@ -107,7 +140,7 @@ func (this *OriginDAO) CreateOrigin(tx *dbs.Tx, adminId int64, userId int64, nam
}
// 修改源站
func (this *OriginDAO) UpdateOrigin(tx *dbs.Tx, originId int64, name string, addrJSON string, description string, weight int32, isOn bool) error {
func (this *OriginDAO) UpdateOrigin(tx *dbs.Tx, originId int64, name string, addrJSON string, description string, weight int32, isOn bool, connTimeout *shared.TimeDuration, readTimeout *shared.TimeDuration, idleTimeout *shared.TimeDuration, maxConns int32, maxIdleConns int32) error {
if originId <= 0 {
return errors.New("invalid originId")
}
@@ -120,6 +153,39 @@ func (this *OriginDAO) UpdateOrigin(tx *dbs.Tx, originId int64, name string, add
weight = 0
}
op.Weight = weight
if connTimeout != nil {
connTimeoutJSON, err := connTimeout.AsJSON()
if err != nil {
return err
}
op.ConnTimeout = connTimeoutJSON
}
if readTimeout != nil {
readTimeoutJSON, err := readTimeout.AsJSON()
if err != nil {
return err
}
op.ReadTimeout = readTimeoutJSON
}
if idleTimeout != nil {
idleTimeoutJSON, err := idleTimeout.AsJSON()
if err != nil {
return err
}
op.IdleTimeout = idleTimeoutJSON
}
if maxConns >= 0 {
op.MaxConns = maxConns
} else {
op.MaxConns = 0
}
if maxIdleConns >= 0 {
op.MaxIdleConns = maxIdleConns
} else {
op.MaxIdleConns = 0
}
op.IsOn = isOn
op.Version = dbs.SQL("version+1")
err := this.Save(tx, op)

55
internal/rpc/services/service_origin.go
View File

@@ -6,6 +6,7 @@ import (
"errors"
"github.com/TeaOSLab/EdgeAPI/internal/db/models"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared"
"github.com/iwind/TeaGo/maps"
)
@@ -32,7 +33,32 @@ func (this *OriginService) CreateOrigin(ctx context.Context, req *pb.CreateOrigi
tx := this.NullTx()
originId, err := models.SharedOriginDAO.CreateOrigin(tx, adminId, userId, req.Name, string(addrMap.AsJSON()), req.Description, req.Weight, req.IsOn)
// 校验参数
var connTimeout = &shared.TimeDuration{}
if len(req.ConnTimeoutJSON) > 0 {
err = json.Unmarshal(req.ConnTimeoutJSON, connTimeout)
if err != nil {
return nil, err
}
}
var readTimeout = &shared.TimeDuration{}
if len(req.ReadTimeoutJSON) > 0 {
err = json.Unmarshal(req.ReadTimeoutJSON, readTimeout)
if err != nil {
return nil, err
}
}
var idleTimeout = &shared.TimeDuration{}
if len(req.IdleTimeoutJSON) > 0 {
err = json.Unmarshal(req.IdleTimeoutJSON, idleTimeout)
if err != nil {
return nil, err
}
}
originId, err := models.SharedOriginDAO.CreateOrigin(tx, adminId, userId, req.Name, string(addrMap.AsJSON()), req.Description, req.Weight, req.IsOn, connTimeout, readTimeout, idleTimeout, req.MaxConns, req.MaxIdleConns)
if err != nil {
return nil, err
}
@@ -61,7 +87,32 @@ func (this *OriginService) UpdateOrigin(ctx context.Context, req *pb.UpdateOrigi
tx := this.NullTx()
err = models.SharedOriginDAO.UpdateOrigin(tx, req.OriginId, req.Name, string(addrMap.AsJSON()), req.Description, req.Weight, req.IsOn)
// 校验参数
var connTimeout = &shared.TimeDuration{}
if len(req.ConnTimeoutJSON) > 0 {
err = json.Unmarshal(req.ConnTimeoutJSON, connTimeout)
if err != nil {
return nil, err
}
}
var readTimeout = &shared.TimeDuration{}
if len(req.ReadTimeoutJSON) > 0 {
err = json.Unmarshal(req.ReadTimeoutJSON, readTimeout)
if err != nil {
return nil, err
}
}
var idleTimeout = &shared.TimeDuration{}
if len(req.IdleTimeoutJSON) > 0 {
err = json.Unmarshal(req.IdleTimeoutJSON, idleTimeout)
if err != nil {
return nil, err
}
}
err = models.SharedOriginDAO.UpdateOrigin(tx, req.OriginId, req.Name, string(addrMap.AsJSON()), req.Description, req.Weight, req.IsOn, connTimeout, readTimeout, idleTimeout, req.MaxConns, req.MaxIdleConns)
if err != nil {
return nil, err
}