UniqueSoft/swirl
3
0
Fork 0
mirror of https://github.com/cuigh/swirl synced 2024-12-29 07:12:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix race issue

Browse Source
This commit is contained in:
cuigh 2018-07-04 14:50:19 +08:00
parent 2ead68fc85
commit b34ef70c66
2 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
biz/chart.go
View File

@ -2,7 +2,6 @@ package biz
import ( import (
"os" "os"
"sync"
"time" "time"
"github.com/cuigh/auxo/data" "github.com/cuigh/auxo/data"
@ -159,45 +158,43 @@ func (b *chartBiz) FetchDatas(key string, names []string, period time.Duration)
return nil, err return nil, err
} }
datas := data.Map{} type Data struct {
name string
data interface{}
err error
}
ch := make(chan Data, len(charts))
end := time.Now() end := time.Now()
start := end.Add(-period) start := end.Add(-period)
var wg sync.WaitGroup
for _, chart := range charts { for _, chart := range charts {
wg.Add(1)
go func(c *model.Chart) { go func(c *model.Chart) {
defer wg.Done() d := Data{name: c.Name}
switch c.Type { switch c.Type {
case "line", "bar": case "line", "bar":
d, err := b.fetchMatrixData(c, key, start, end) d.data, d.err = b.fetchMatrixData(c, key, start, end)
if err != nil {
log.Get("metric").Error(err)
} else {
datas[c.Name] = d
}
case "pie": case "pie":
d, err := b.fetchVectorData(c, key, end) d.data, d.err = b.fetchVectorData(c, key, end)
if err != nil {
log.Get("metric").Error(err)
} else {
datas[c.Name] = d
}
case "gauge": case "gauge":
d, err := b.fetchScalarData(c, key, end) d.data, d.err = b.fetchScalarData(c, key, end)
if err != nil { default:
log.Get("metric").Error(err) d.err = errors.New("invalid chart type: " + c.Type)
} else {
datas[c.Name] = &model.ChartValue{
//Name: "",
Value: d,
}
}
} }
ch <- d
}(chart) }(chart)
} }
wg.Wait()
return datas, nil ds := data.Map{}
for range charts {
d := <-ch
if d.err != nil {
log.Get("metric").Error(err)
} else {
ds.Set(d.name, d.data)
}
}
close(ch)
return ds, nil
} }
func (b *chartBiz) fetchMatrixData(chart *model.Chart, key string, start, end time.Time) (*model.ChartMatrixData, error) { func (b *chartBiz) fetchMatrixData(chart *model.Chart, key string, start, end time.Time) (*model.ChartMatrixData, error) {
@ -230,13 +227,21 @@ func (b *chartBiz) fetchVectorData(chart *model.Chart, key string, end time.Time
return Metric.GetVector(query, chart.Legend, end) return Metric.GetVector(query, chart.Legend, end)
} }
func (b *chartBiz) fetchScalarData(chart *model.Chart, key string, end time.Time) (float64, error) { func (b *chartBiz) fetchScalarData(chart *model.Chart, key string, end time.Time) (*model.ChartValue, error) {
query, err := b.formatQuery(chart.Metrics[0].Query, chart.Dashboard, key) query, err := b.formatQuery(chart.Metrics[0].Query, chart.Dashboard, key)
if err != nil { if err != nil {
return 0, err return nil, err
} }
return Metric.GetScalar(query, end) v, err := Metric.GetScalar(query, end)
if err != nil {
return nil, err
}
return &model.ChartValue{
//Name: "",
Value: v,
}, nil
} }
func (b *chartBiz) formatQuery(query, dashboard, key string) (string, error) { func (b *chartBiz) formatQuery(query, dashboard, key string) (string, error) {

2
main.go
View File

@ -28,7 +28,7 @@ func main() {
misc.BindOptions() misc.BindOptions()
app.Name = "Swirl" app.Name = "Swirl"
app.Version = "0.8.1" app.Version = "0.8.2"
app.Desc = "A web management UI for Docker, focused on swarm cluster" app.Desc = "A web management UI for Docker, focused on swarm cluster"
app.Action = func(ctx *app.Context) { app.Action = func(ctx *app.Context) {
err := config.UnmarshalOption("swirl", &misc.Options) err := config.UnmarshalOption("swirl", &misc.Options)