Merge pull request #1122 from foozlevazquez/dev

Convert cached_datapoints from dict if needed.
graphite-project · Feb 14, 2015 · 1df5e2e · 1df5e2e
2 parents da85275 + ac306a1
commit 1df5e2e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/webapp/graphite/readers.py b/webapp/graphite/readers.py
@@ -171,6 +171,9 @@ def fetch(self, startTime, endTime):
       log.exception("Failed CarbonLink query '%s'" % self.real_metric_path)
       cached_datapoints = []
 
+    if isinstance(cached_datapoints, dict):
+      cached_datapoints = cached_datapoints.items()
+
     for (timestamp, value) in cached_datapoints:
       interval = timestamp - (timestamp % step)