github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-05-06 01:08:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: pull Publish() call up to publishLoop()

Browse Source
This commit is contained in:
Bryan Boreham
2019-09-13 07:53:00 +00:00
parent 938d59489c
commit eff5a1f9f7
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
probe/probe.go
View File

@@ -208,7 +208,7 @@ func (p *Probe) tag(r report.Report) report.Report {
return r
}
func (p *Probe) drainAndPublish(rpt report.Report, rs chan report.Report) {
func (p *Probe) drainAndSanitise(rpt report.Report, rs chan report.Report) report.Report {
p.rateLimiter.Wait(context.Background())
ForLoop:
for {
@@ -225,9 +225,7 @@ ForLoop:
t.Controls = report.Controls{}
})
}
if err := p.publisher.Publish(rpt); err != nil {
log.Infof("Publish: %v", err)
}
return rpt
}
func (p *Probe) publishLoop() {
@@ -235,15 +233,21 @@ func (p *Probe) publishLoop() {
pubTick := time.Tick(p.publishInterval)
for {
var err error
select {
case <-pubTick:
p.drainAndPublish(report.MakeReport(), p.spiedReports)
rpt := p.drainAndSanitise(report.MakeReport(), p.spiedReports)
err = p.publisher.Publish(rpt)
case rpt := <-p.shortcutReports:
p.drainAndPublish(rpt, p.shortcutReports)
rpt = p.drainAndSanitise(rpt, p.shortcutReports)
err = p.publisher.Publish(rpt)
case <-p.quit:
return
}
if err != nil {
log.Infof("Publish: %v", err)
}
}
}