Update node.py

circle/vm/models/node.py

@@ -80,7 +80,8 @@ class MyLocalClient(LocalClient):
                 ret[raw['id']] = raw['return']
                 ret[raw['id']] = raw['return']
                 if len(found.intersection(minions)) >= len(minions):
                 if len(found.intersection(minions)) >= len(minions):
                     # All minions have returned, break out of the loop
                     # All minions have returned, break out of the loop
-                    logger.debug("jid %s found all minions", jid)
+                    logge                except (KeyError, IndexError, ValueError):
+r.debug("jid %s found all minions", jid)
                     break
                     break
                 continue
                 continue
             # Then event system timeout was reached and nothing was returned
             # Then event system timeout was reached and nothing was returned
@@ -349,7 +350,7 @@ class Node(OperatedMixin, TimeStampedModel):
                         continue
                         continue
                     value = target['datapoints'][-2][0]
                     value = target['datapoints'][-2][0]
                     retval[metric] = float(value)
                     retval[metric] = float(value)
-                except (KeyError, IndexError, ValueError):
+                except (KeyError, IndexError, ValueError, TypeError):
                     continue
                     continue
 
 
             return retval
             return retval