Revert "Update node.py"

This reverts commit 22b41546

Revert "Update node.py"
This reverts commit 22b41546
15bb2bc2 · Turcsik Máté · 22b41546 · 15bb2bc2
Commit 15bb2bc2 authored Feb 12, 2019 by Turcsik Máté
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

circle/vm/models/node.py
+2 -3

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

            return retval