ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

Reinstate Ctrl+C handling

Browse source
This commit is contained in:
Michael DeHaan 2012-10-24 07:40:31 -04:00
parent ca4fb043ef
commit 47b1315ac7
1 changed files with 4 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
lib/ansible/runner/__init__.py
View file

@ -57,29 +57,13 @@ multiprocessing_runner = None
################################################ ################################################
def __old__executor_hook(job_queue, result_queue):
''' callback used by multiprocessing pool '''
# attempt workaround of https://github.com/newsapps/beeswithmachineguns/issues/17
# this function also not present in CentOS 6
if HAS_ATFORK:
atfork()
signal.signal(signal.SIGINT, signal.SIG_IGN)
while not job_queue.empty():
try:
host = job_queue.get(block=False)
result_queue.put(multiprocessing_runner._executor(host))
except Queue.Empty:
pass
except:
traceback.print_exc()
def _executor_hook(host): def _executor_hook(host):
# attempt workaround of https://github.com/newsapps/beeswithmachineguns/issues/17 # attempt workaround of https://github.com/newsapps/beeswithmachineguns/issues/17
# this function also not present in CentOS 6 # this function also not present in CentOS 6
if HAS_ATFORK: if HAS_ATFORK:
atfork() atfork()
signal.signal(signal.SIGINT, signal.SIG_IGN)
return multiprocessing_runner._executor(host) return multiprocessing_runner._executor(host)
class HostVars(dict): class HostVars(dict):
@ -579,37 +563,11 @@ class Runner(object):
# argument but may not be anymore. # argument but may not be anymore.
p = multiprocessing.Pool(self.forks) p = multiprocessing.Pool(self.forks)
return p.map(_executor_hook, hosts)
OLD_METHOD = '''
manager = multiprocessing.Manager()
job_queue = manager.Queue()
[job_queue.put(i) for i in hosts]
result_queue = manager.Queue()
workers = []
for i in range(self.forks):
prc = multiprocessing.Process(target=_executor_hook,
args=(job_queue, result_queue))
prc.start()
workers.append(prc)
try: try:
for worker in workers: return p.map(_executor_hook, hosts)
worker.join()
except KeyboardInterrupt: except KeyboardInterrupt:
for worker in workers: pool.terminate()
worker.terminate() raise errors.AnsibleError("Interrupted")
worker.join()
results = []
try:
while not result_queue.empty():
results.append(result_queue.get(block=False))
except socket.error:
raise errors.AnsibleError("<interrupted>")
return results
'''
# ***************************************************** # *****************************************************