commit 7027ff5defbd207f9e49ed8ebbfecf3897348113
author Simon Pasquier <spasquier@mirantis.com> Thu Jan 05 17:13:55 2017 +0100
committer Simon Pasquier <spasquier@mirantis.com> Thu Jan 05 17:13:55 2017 +0100
tree 562473d6361c1d2fac954870fa5ff74c07c773e1
parent 3366eed852018114cb16a11c41a0166603cf7a5d

Fix collectd_openstack.py for None values

collectd/files/plugin/collectd_openstack.py

diff --git a/collectd/files/plugin/collectd_openstack.py b/collectd/files/plugin/collectd_openstack.py
index 5539338..955d780 100644
--- a/collectd/files/plugin/collectd_openstack.py
+++ b/collectd/files/plugin/collectd_openstack.py
@@ -345,5 +345,9 @@
         counts = defaultdict(int)
         for obj in list_object:
             s = group_by_func(obj)
-            counts[s] += count_func(obj) if count_func else 1
+            try:
+                counts[s] += count_func(obj) if count_func else 1
+            except TypeError:
+                # Ignore when count_func() doesn't return a number
+                pass
         return counts