From 0907cdfa0dd4be47e75ba90566e3006eb14d9842 Mon Sep 17 00:00:00 2001 From: Jonathan Lange Date: Tue, 7 Jun 2016 19:00:14 +0100 Subject: [PATCH] Fail fast on error fetching non-cached reports --- app/multitenant/dynamo_collector.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/multitenant/dynamo_collector.go b/app/multitenant/dynamo_collector.go index d84c4818b..81190b9f9 100644 --- a/app/multitenant/dynamo_collector.go +++ b/app/multitenant/dynamo_collector.go @@ -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 }