Commit 40ff3eb1 by Michael DeHaan

Catch socket errors so if you control-c a playbook it does not traceback

parent 33bc2610
...@@ -28,6 +28,7 @@ import base64 ...@@ -28,6 +28,7 @@ import base64
import getpass import getpass
import codecs import codecs
import collections import collections
import socket
import re import re
import ansible.constants as C import ansible.constants as C
...@@ -741,8 +742,11 @@ class Runner(object): ...@@ -741,8 +742,11 @@ class Runner(object):
worker.join() worker.join()
results = [] results = []
while not result_queue.empty(): try:
results.append(result_queue.get(block=False)) while not result_queue.empty():
results.append(result_queue.get(block=False))
except socket.error:
raise errors.AnsibleError("<interrupted>")
return results return results
# ***************************************************** # *****************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment