tcjlj/nezha
1
0
Fork 0
mirror of https://github.com/nezhahq/nezha.git synced 2025-01-23 05:08:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

🚸 优化重连超时，提高可用性

Browse Source
This commit is contained in:
naiba 2021-05-22 10:56:30 +08:00
parent a09628ed42
commit 3e09c12dc7
1 changed files with 39 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
cmd/agent/main.go
View File

@ -28,6 +28,11 @@ import (
"github.com/naiba/nezha/service/rpc" "github.com/naiba/nezha/service/rpc"
) )
func init() {
cert.TimeoutSeconds = 30
http.DefaultClient.Timeout = time.Second * 5
}
var ( var (
server string server string
clientSecret string clientSecret string
@ -37,7 +42,6 @@ var (
var ( var (
client pb.NezhaServiceClient client pb.NezhaServiceClient
ctx = context.Background() ctx = context.Background()
delayWhenError = time.Second * 10 // Agent 重连间隔
updateCh = make(chan struct{}) // Agent 自动更新间隔 updateCh = make(chan struct{}) // Agent 自动更新间隔
httpClient = &http.Client{ httpClient = &http.Client{
Transport: &http.Transport{ Transport: &http.Transport{
@ -46,32 +50,13 @@ var (
CheckRedirect: func(req *http.Request, via []*http.Request) error { CheckRedirect: func(req *http.Request, via []*http.Request) error {
return http.ErrUseLastResponse return http.ErrUseLastResponse
}, },
Timeout: time.Second * 30,
} }
) )
func doSelfUpdate() { const (
defer func() { delayWhenError = time.Second * 10 // Agent 重连间隔
time.Sleep(time.Minute * 20) )
updateCh <- struct{}{}
}()
v := semver.MustParse(version)
println("Check update", v)
latest, err := selfupdate.UpdateSelf(v, "naiba/nezha")
if err != nil {
println("Binary update failed:", err)
return
}
if latest.Version.Equals(v) {
println("Current binary is up to date", version)
} else {
println("Upgrade successfully", latest.Version)
os.Exit(1)
}
}
func init() {
cert.TimeoutSeconds = 30
}
func main() { func main() {
// 来自于 GoReleaser 的版本号 // 来自于 GoReleaser 的版本号
@ -106,7 +91,7 @@ func run() {
// 更新IP信息 // 更新IP信息
go monitor.UpdateIP() go monitor.UpdateIP()
if version != "" { if _, err := semver.Parse(version); err == nil {
go func() { go func() {
for range updateCh { for range updateCh {
go doSelfUpdate() go doSelfUpdate()
@ -128,12 +113,15 @@ func run() {
} }
for { for {
conn, err = grpc.Dial(server, grpc.WithInsecure(), grpc.WithPerRPCCredentials(&auth)) timeOutCtx, cancel := context.WithTimeout(ctx, time.Second*5)
conn, err = grpc.DialContext(timeOutCtx, server, grpc.WithInsecure(), grpc.WithPerRPCCredentials(&auth))
if err != nil { if err != nil {
println("grpc.Dial err: ", err) println("grpc.Dial err: ", err)
cancel()
retry() retry()
continue continue
} }
cancel()
client = pb.NewNezhaServiceClient(conn) client = pb.NewNezhaServiceClient(conn)
// 第一步注册 // 第一步注册
_, err = client.ReportSystemInfo(ctx, monitor.GetHost().PB()) _, err = client.ReportSystemInfo(ctx, monitor.GetHost().PB())
@ -209,7 +197,7 @@ func doTask(task *pb.Task) {
pinger, err := ping.NewPinger(task.GetData()) pinger, err := ping.NewPinger(task.GetData())
if err == nil { if err == nil {
pinger.SetPrivileged(true) pinger.SetPrivileged(true)
pinger.Count = 10 pinger.Count = 5
pinger.Timeout = time.Second * 20 pinger.Timeout = time.Second * 20
err = pinger.Run() // Blocks until finished. err = pinger.Run() // Blocks until finished.
} }
@ -293,6 +281,26 @@ func reportState() {
} }
} }
func doSelfUpdate() {
defer func() {
time.Sleep(time.Minute * 20)
updateCh <- struct{}{}
}()
v := semver.MustParse(version)
println("Check update", v)
latest, err := selfupdate.UpdateSelf(v, "naiba/nezha")
if err != nil {
println("Binary update failed:", err)
return
}
if latest.Version.Equals(v) {
println("Current binary is up to date", version)
} else {
println("Upgrade successfully", latest.Version)
os.Exit(1)
}
}
func println(v ...interface{}) { func println(v ...interface{}) {
if dao.Conf.Debug { if dao.Conf.Debug {
log.Println(v...) log.Println(v...)