While the previous work on the foon class can't be quite recycled, it's still a nice abstraction.

This commit is contained in:
Michael DeHaan
2014-02-07 19:32:19 -05:00
parent 73ca1a173c
commit caab52aee2
2 changed files with 8 additions and 20 deletions

View File

@@ -63,7 +63,6 @@ PROCESS_LOCKFILE = tempfile.TemporaryFile()
from foon import Foon
FOON = Foon()
################################################
@@ -1058,11 +1057,10 @@ class Runner(object):
# *****************************************************
def _parallel_exec(self, hosts):
def _parallel_exec(self, params):
''' handles mulitprocessing when more than 1 fork is required '''
FOON.set_size(self.forks)
return FOON.map(_executor_hook, hosts)
return self.foon.map(_executor_hook, params)
# *****************************************************
@@ -1114,6 +1112,8 @@ class Runner(object):
if self.forks == 0 or self.forks > len(hosts):
self.forks = len(hosts)
self.foon = Foon(self.forks)
if p and getattr(p, 'BYPASS_HOST_LOOP', None):
# Expose the current hostgroup to the bypassing plugins