x/timmy
Code Issues Proposed changes

Refactor exec_filter (cosmetic change)

Browse Source
This commit is contained in:
f3flight 2016-04-29 02:38:12 +00:00
parent 19df3a3cd7
commit a396b2593f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
timmy/nodes.py
View File

@ -542,10 +542,9 @@ class Nodes(object):
and ((not f.node_ids) or (node.node_id in f.node_ids))) and ((not f.node_ids) or (node.node_id in f.node_ids)))
else: else:
result = True result = True
result = result and (((self.cluster and node.cluster != 0 return result and (((self.cluster and node.cluster != 0
and str(self.cluster) == str(node.cluster)) and str(self.cluster) == str(node.cluster))
or not self.cluster) and node.online) or not self.cluster) and node.online)
return result
def launch_ssh(self, odir='info', timeout=15, fake=False): def launch_ssh(self, odir='info', timeout=15, fake=False):
lock = flock.FLock('/tmp/timmy-cmds.lock') lock = flock.FLock('/tmp/timmy-cmds.lock')