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

Merge pull request #2979 from weaveworks/cache-upgraded-reports

Browse Source 
Upgrade reports before caching
This commit is contained in:
Roberto Bruggemann
2017-12-13 10:40:47 +00:00
committed by GitHub
parent e16385f647 10f3e4c0dc
commit 930c4b5383
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/collector.go
View File

@@ -152,7 +152,11 @@ func (c *collector) Report(_ context.Context, timestamp time.Time) (report.Repor
c.clean()
c.quantise()
rpt := c.merger.Merge(c.reports).Upgrade()
for i := range c.reports {
c.reports[i] = c.reports[i].Upgrade()
}
rpt := c.merger.Merge(c.reports)
c.cached = &rpt
return rpt, nil
}

3
app/multitenant/aws_collector.go
View File

@@ -284,6 +284,7 @@ func (c *awsCollector) getReports(ctx context.Context, reportKeys []string) ([]r
log.Warningf("Error fetching from cache: %v", err)
}
for key, report := range found {
report = report.Upgrade()
c.inProcess.StoreReport(key, report)
reports = append(reports, report)
}
@@ -337,7 +338,7 @@ func (c *awsCollector) Report(ctx context.Context, timestamp time.Time) (report.
return report.MakeReport(), err
}
return c.merger.Merge(reports).Upgrade(), nil
return c.merger.Merge(reports), nil
}
func (c *awsCollector) HasHistoricReports() bool {