x/timmy
Code Issues Proposed changes

Refactor - fix flake8 warnings

Browse Source
This commit is contained in:
f3flight 2016-05-03 18:42:01 +00:00
parent 6fe0c53f23
commit d67d6df7a9
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
setup.py
View File

@ -4,20 +4,17 @@ from setuptools import setup
import os
rqfiles = [('/usr/share/timmy/' + root, [os.path.join(root, f) for f in files])
for root, dirs, files in os.walk('rq')]
for root, dirs, files in os.walk('rq')]
rqfiles.append(('/usr/share/timmy/configs', ['config.yaml']))
setup(name='timmy',
version='0.1',
author = "Aleksandr Dobdin",
author_email = 'dobdin@gmail.com',
license = 'Apache2',
url = 'https://github.com/adobdin/timmy',
author="Aleksandr Dobdin",
author_email='dobdin@gmail.com',
license='Apache2',
url='https://github.com/adobdin/timmy',
long_description=open('README.md').read(),
packages = ["timmy"],
data_files = rqfiles,
include_package_data = True,
entry_points = {
'console_scripts': ['timmy = timmy.cli:main']
}
)
packages=["timmy"],
data_files=rqfiles,
include_package_data=True,
entry_points={'console_scripts': ['timmy=timmy.cli:main']})

20
timmy/nodes.py
View File

@ -478,14 +478,14 @@ class Nodes(object):
def exec_filter(self, node):
f = self.conf.soft_filter
if f:
result = (((not f.status) or (node.status in f.status))
and ((not f.roles) or (node.role in f.roles))
and ((not f.node_ids) or (node.node_id in f.node_ids)))
result = (((not f.status) or (node.status in f.status)) and
((not f.roles) or (node.role in f.roles)) and
((not f.node_ids) or (node.node_id in f.node_ids)))
else:
result = True
return result and (((self.cluster and node.cluster != 0
and str(self.cluster) == str(node.cluster))
or not self.cluster) and node.online)
return result and (((self.cluster and node.cluster != 0 and
str(self.cluster) == str(node.cluster)) or not
self.cluster) and node.online)
def launch_ssh(self, odir='info', timeout=15, fake=False):
lock = flock.FLock('/tmp/timmy-cmds.lock')
@ -495,8 +495,8 @@ class Nodes(object):
try:
label = ckey
run_items = []
for node in [n for n in self.nodes.values() if self.exec_filter(n)]:
run_items.append(tools.RunItem(target=node.exec_cmd,
for n in [n for n in self.nodes.values() if self.exec_filter(n)]:
run_items.append(tools.RunItem(target=n.exec_cmd,
args={'label': label,
'odir': odir,
'fake': fake}))
@ -616,8 +616,8 @@ class Nodes(object):
try:
label = fkey
run_items = []
for node in [n for n in self.nodes.values() if self.exec_filter(n)]:
run_items.append(tools.RunItem(target=node.get_files,
for n in [n for n in self.nodes.values() if self.exec_filter(n)]:
run_items.append(tools.RunItem(target=n.get_files,
args={'label': label,
'odir': odir}))
tools.run_batch(run_items, 10)