saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #40264 from meaksh/2016.3-gather_job_timeout-fix

Browse source 
Makes sure "gather_job_timeout" is an Integer
This commit is contained in:
Mike Place 2017-03-27 17:52:50 -06:00 • committed by GitHub
commit 1381f97292
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/client/__init__.py
View file

@ -220,7 +220,7 @@ class LocalClient(object):
Return the information about a given job
'''
log.debug('Checking whether jid {0} is still running'.format(jid))
timeout = kwargs.get('gather_job_timeout', self.opts['gather_job_timeout'])
timeout = int(kwargs.get('gather_job_timeout', self.opts['gather_job_timeout']))
pub_data = self.run_job(tgt,
'saltutil.find_job',
@ -927,7 +927,7 @@ class LocalClient(object):
if timeout is None:
timeout = self.opts['timeout']
gather_job_timeout = kwargs.get('gather_job_timeout', self.opts['gather_job_timeout'])
gather_job_timeout = int(kwargs.get('gather_job_timeout', self.opts['gather_job_timeout']))
start = int(time.time())
# timeouts per minion, id_ -> timeout time