test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-11-30 10:48:15 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[FIX] fix bug

Browse Source
This commit is contained in:
zhoujunhao 2018-07-26 23:06:18 +08:00
parent 5476b1698c
commit 83a060ae44
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
monitor/callback/builder.go
View File

@ -26,6 +26,7 @@ import (
"github.com/goodrain/rainbond/monitor/utils"
"github.com/prometheus/common/model"
"time"
"github.com/tidwall/gjson"
)
type Builder struct {
@ -35,7 +36,18 @@ type Builder struct {
}
func (b *Builder) UpdateEndpoints(endpoints ...*config.Endpoint) {
newArr := utils.TrimAndSort(endpoints)
// 用v3 API注册，返回json格试，所以要提前处理一下
newEndpoints := make([]*config.Endpoint, 0, len(endpoints))
for _, end := range endpoints {
newEnd := *end
newEndpoints = append(newEndpoints, &newEnd)
}
for i, end := range endpoints {
newEndpoints[i].URL = gjson.Get(end.URL, "Addr").String()
}
newArr := utils.TrimAndSort(newEndpoints)
if utils.ArrCompare(b.sortedEndpoints, newArr) {
logrus.Debugf("The endpoints is not modify: %s", b.Name())

16
monitor/callback/worker.go
View File

@ -26,6 +26,7 @@ import (
"github.com/goodrain/rainbond/monitor/utils"
"github.com/prometheus/common/model"
"time"
"github.com/tidwall/gjson"
)
type Worker struct {
@ -35,7 +36,18 @@ type Worker struct {
}
func (w *Worker) UpdateEndpoints(endpoints ...*config.Endpoint) {
newArr := utils.TrimAndSort(endpoints)
// 用v3 API注册，返回json格试，所以要提前处理一下
newEndpoints := make([]*config.Endpoint, 0, len(endpoints))
for _, end := range endpoints {
newEnd := *end
newEndpoints = append(newEndpoints, &newEnd)
}
for i, end := range endpoints {
newEndpoints[i].URL = gjson.Get(end.URL, "Addr").String()
}
newArr := utils.TrimAndSort(newEndpoints)
if utils.ArrCompare(w.sortedEndpoints, newArr) {
logrus.Debugf("The endpoints is not modify: %s", w.Name())
@ -53,7 +65,7 @@ func (w *Worker) Error(err error) {
}
func (w *Worker) Name() string {
return "builder"
return "worker"
}
func (w *Worker) toScrape() *prometheus.ScrapeConfig {