valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix issue #8941

Browse Source
This commit is contained in:
Ollie Walsh 2013-12-02 11:38:02 +00:00
parent 49e3964274
commit 828763317a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
salt/utils/schedule.py
View File

@ -243,15 +243,17 @@ class Schedule(object):
'job {0}, defaulting to 1.'.format(job))
data['maxrunning'] = 1
if self.opts.get('multiprocessing', True):
thread_cls = multiprocessing.Process
else:
thread_cls = threading.Thread
proc = thread_cls(target=self.handle_func, args=(func, data))
proc.start()
if self.opts.get('multiprocessing', True):
proc.join()
self.intervals[job] = int(time.time())
try:
if self.opts.get('multiprocessing', True):
thread_cls = multiprocessing.Process
else:
thread_cls = threading.Thread
proc = thread_cls(target=self.handle_func, args=(func, data))
proc.start()
if self.opts.get('multiprocessing', True):
proc.join()
finally:
self.intervals[job] = int(time.time())
def clean_proc_dir(opts):