github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-07-28 01:31:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1612 from weaveworks/fix-memcache-crash

Browse Source 
Fix nil pointer error when memcache not enabled
This commit is contained in:
Jonathan Lange
2016-06-26 14:37:38 +01:00
committed by GitHub
parent 29133e54ca 387c543a87
commit d99a0162c6
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/multitenant/dynamo_collector.go
View File

@@ -330,8 +330,12 @@ func (c *dynamoDBCollector) getReports(userid string, row int64, start, end time
return nil, err
}
stores := []ReportStore{c.inProcess}
if c.memcache != nil {
stores = append(stores, c.memcache)
}
var reports []report.Report
for _, store := range []ReportStore{c.inProcess, c.memcache} {
for _, store := range stores {
if store == nil {
continue
}