Fix Coroutine Leaks and Proxy Handling in http.Client (#304)

* fix: builtin variable conflict

* feat: add pkg/utils/http HttpClientSkipTlsVerify HttpClient

* fix: realtime create http Transport

* fix: http keepalive connection may not reusable

* feat: allow http request use proxy from environment
This commit is contained in:
Mmx 2023-12-05 23:22:25 +08:00 committed by GitHub
parent 3059bf2d49
commit 1dcd899591
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 65 additions and 14 deletions

View File

@ -85,13 +85,13 @@ func (r *AlertRule) Snapshot(cycleTransferStats *CycleTransferStats, server *Ser
// Check 传入包含当前报警规则下所有type检查结果的空接口 返回报警持续时间与是否通过报警检查(通过则返回true) // Check 传入包含当前报警规则下所有type检查结果的空接口 返回报警持续时间与是否通过报警检查(通过则返回true)
func (r *AlertRule) Check(points [][]interface{}) (int, bool) { func (r *AlertRule) Check(points [][]interface{}) (int, bool) {
var max int // 报警持续时间 var maxNum int // 报警持续时间
var count int // 检查未通过的个数 var count int // 检查未通过的个数
for i := 0; i < len(r.Rules); i++ { for i := 0; i < len(r.Rules); i++ {
if r.Rules[i].IsTransferDurationRule() { if r.Rules[i].IsTransferDurationRule() {
// 循环区间流量报警 // 循环区间流量报警
if max < 1 { if maxNum < 1 {
max = 1 maxNum = 1
} }
for j := len(points[i]) - 1; j >= 0; j-- { for j := len(points[i]) - 1; j >= 0; j-- {
if points[i][j] != nil { if points[i][j] != nil {
@ -104,8 +104,8 @@ func (r *AlertRule) Check(points [][]interface{}) (int, bool) {
total := 0.0 total := 0.0
fail := 0.0 fail := 0.0
num := int(r.Rules[i].Duration) num := int(r.Rules[i].Duration)
if num > max { if num > maxNum {
max = num maxNum = num
} }
if len(points) < num { if len(points) < num {
continue continue
@ -124,5 +124,5 @@ func (r *AlertRule) Check(points [][]interface{}) (int, bool) {
} }
} }
// 仅当所有检查均未通过时 返回false // 仅当所有检查均未通过时 返回false
return max, count != len(r.Rules) return maxNum, count != len(r.Rules)
} }

View File

@ -1,7 +1,6 @@
package model package model
import ( import (
"crypto/tls"
"errors" "errors"
"fmt" "fmt"
"io" "io"
@ -117,11 +116,14 @@ func (ns *NotificationServerBundle) Send(message string) error {
verifySSL = true verifySSL = true
} }
transCfg := &http.Transport{ var client *http.Client
TLSClientConfig: &tls.Config{InsecureSkipVerify: verifySSL},
if verifySSL {
client = utils.HttpClient
} else {
client = utils.HttpClientSkipTlsVerify
} }
client := &http.Client{Transport: transCfg, Timeout: time.Minute * 10}
reqBody, err := ns.reqBody(message) reqBody, err := ns.reqBody(message)
if err != nil { if err != nil {
return err return err
@ -147,13 +149,15 @@ func (ns *NotificationServerBundle) Send(message string) error {
if err != nil { if err != nil {
return err return err
} }
defer func() {
_ = resp.Body.Close()
}()
if resp.StatusCode < 200 || resp.StatusCode > 299 { if resp.StatusCode < 200 || resp.StatusCode > 299 {
defer func() {
_ = resp.Body.Close()
}()
body, _ := io.ReadAll(resp.Body) body, _ := io.ReadAll(resp.Body)
return fmt.Errorf("%d@%s %s", resp.StatusCode, resp.Status, string(body)) return fmt.Errorf("%d@%s %s", resp.StatusCode, resp.Status, string(body))
} else {
_, _ = io.Copy(io.Discard, resp.Body)
} }
return nil return nil

47
pkg/utils/http.go Normal file
View File

@ -0,0 +1,47 @@
package utils
import (
"crypto/tls"
"net/http"
"time"
)
var (
HttpClientSkipTlsVerify *http.Client
HttpClient *http.Client
)
func init() {
HttpClientSkipTlsVerify = httpClient(_httpClient{
Transport: httpTransport(_httpTransport{
VerifySSL: true,
}),
})
HttpClient = httpClient(_httpClient{
Transport: httpTransport(_httpTransport{
VerifySSL: false,
}),
})
}
type _httpTransport struct {
VerifySSL bool
}
func httpTransport(conf _httpTransport) *http.Transport {
return &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: conf.VerifySSL},
Proxy: http.ProxyFromEnvironment,
}
}
type _httpClient struct {
Transport *http.Transport
}
func httpClient(conf _httpClient) *http.Client {
return &http.Client{
Transport: conf.Transport,
Timeout: time.Minute * 10,
}
}