mirror of
https://github.com/weaveworks/scope.git
synced 2026-03-03 02:00:43 +00:00
Merge pull request #231 from tomwilkie/foo-debug
Squash merged reports as they come out of the LIFO, not individual reports as they come in.
This commit is contained in:
@@ -41,7 +41,6 @@ func NewReportLIFO(r reporter, maxAge time.Duration) *ReportLIFO {
|
||||
select {
|
||||
case report := <-r.Reports():
|
||||
// Incoming report from the collecter.
|
||||
report = report.Squash() // TODO?: make this a CLI argument.
|
||||
tr := timedReport{
|
||||
Timestamp: time.Now(),
|
||||
Report: report,
|
||||
@@ -55,6 +54,7 @@ func NewReportLIFO(r reporter, maxAge time.Duration) *ReportLIFO {
|
||||
for _, r := range l.reports {
|
||||
report.Merge(r.Report)
|
||||
}
|
||||
report = report.Squash() // TODO?: make this a CLI argument.
|
||||
req <- report
|
||||
|
||||
case q := <-l.quit:
|
||||
|
||||
Reference in New Issue
Block a user