x/timmy
Code Issues Proposed changes

Implement support for full paths to scripts / filelists

Browse Source
This commit is contained in:
f3flight 2016-06-10 01:43:48 +00:00
parent 377f429002
commit e87b93fa43
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
timmy/nodes.py
View File

@ -202,7 +202,10 @@ class Node(object):
self.scripts = sorted(self.scripts) self.scripts = sorted(self.scripts)
mapscr = {} mapscr = {}
for scr in self.scripts: for scr in self.scripts:
f = os.path.join(self.rqdir, Node.skey, scr) if os.path.sep in scr:
f = scr
else:
f = os.path.join(self.rqdir, Node.skey, scr)
self.logger.info('node:%s(%s), exec: %s' % (self.id, self.ip, f)) self.logger.info('node:%s(%s), exec: %s' % (self.id, self.ip, f))
dfile = os.path.join(ddir, 'node-%s-%s-%s' % dfile = os.path.join(ddir, 'node-%s-%s-%s' %
(self.id, self.ip, os.path.basename(f))) (self.id, self.ip, os.path.basename(f)))
@ -257,7 +260,10 @@ class Node(object):
else: else:
data = '' data = ''
for f in self.filelists: for f in self.filelists:
fname = os.path.join(self.rqdir, Node.flkey, f) if os.path.sep in f:
fname = f
else:
fname = os.path.join(self.rqdir, Node.flkey, f)
try: try:
with open(fname, 'r') as df: with open(fname, 'r') as df:
for line in df: for line in df: