Skip to content

CIRCLE / cloud

Go to a project
Commit 15bb2bc2 by Turcsik Máté
Options

Revert "Update node.py" 

This reverts commit 22b41546
parent 22b41546
Pipeline #693 passed with stage
in 0 seconds
Showing with 2 additions and 3 deletions
circle/vm/models/node.py
...@@ -80,8 +80,7 @@ class MyLocalClient(LocalClient): ...@@ -80,8 +80,7 @@ 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
logge except (KeyError, IndexError, ValueError): logger.debug("jid %s found all minions", jid)
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
...@@ -350,7 +349,7 @@ class Node(OperatedMixin, TimeStampedModel): ...@@ -350,7 +349,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, TypeError): except (KeyError, IndexError, ValueError):
continue continue
return retval return retval
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment