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

Fail fast on error fetching non-cached reports

Browse Source
This commit is contained in:
Jonathan Lange
2016-06-07 19:00:14 +01:00
parent 3d12a2a76c
commit 0907cdfa0d
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/multitenant/dynamo_collector.go
View File

@@ -253,6 +253,7 @@ func (c *dynamoDBCollector) getNonCached(reportKeys []string) ([]report.Report,
return reports, nil
}
// Fetch a single report from S3.
func (c *dynamoDBCollector) getNonCachedReport(reportKey string) (report.Report, error) {
var resp *s3.GetObjectOutput
err := timeRequest("Get", s3RequestDuration, func() error {
@@ -263,19 +264,16 @@ func (c *dynamoDBCollector) getNonCachedReport(reportKey string) (report.Report,
})
return err
})
// XXX: Not sure why this one is returned out when the rest are logged.
if err != nil {
return report.Report{}, err
}
reader, err := gzip.NewReader(resp.Body)
if err != nil {
log.Errorf("Error gunzipping report: %v", err)
return report.Report{}, nil
return report.Report{}, err
}
rep := report.MakeReport()
if err := codec.NewDecoder(reader, &codec.MsgpackHandle{}).Decode(&rep); err != nil {
log.Errorf("Failed to decode report: %v", err)
return report.Report{}, nil
return report.Report{}, err
}
return rep, nil
}