internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-07 22:02:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reset persistent connection only if it is active (#33238)

Browse Source 
Fixes #33237

Add check to reset connection only is persistent socket
file exist

Fix review comments
This commit is contained in:
Ganesh Nalawade
2017-11-29 00:52:12 +05:30
committed by GitHub
parent 3a2c1541ca
commit ff938bfdd5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ansible/plugins/strategy/__init__.py
View File

@@ -36,7 +36,7 @@ from ansible.inventory.host import Host
from ansible.module_utils.six.moves import queue as Queue from ansible.module_utils.six.moves import queue as Queue
from ansible.module_utils.six import iteritems, itervalues, string_types from ansible.module_utils.six import iteritems, itervalues, string_types
from ansible.module_utils._text import to_text from ansible.module_utils._text import to_text
from ansible.module_utils.connection import Connection from ansible.module_utils.connection import Connection, ConnectionError
from ansible.playbook.helpers import load_list_of_blocks from ansible.playbook.helpers import load_list_of_blocks
from ansible.playbook.included_file import IncludedFile from ansible.playbook.included_file import IncludedFile
from ansible.playbook.task_include import TaskInclude from ansible.playbook.task_include import TaskInclude
@@ -140,8 +140,12 @@ class StrategyBase:
def cleanup(self): def cleanup(self):
# close active persistent connections # close active persistent connections
for sock in itervalues(self._active_connections): for sock in itervalues(self._active_connections):
conn = Connection(sock) try:
conn.reset() conn = Connection(sock)
conn.reset()
except ConnectionError as e:
# most likely socket is already closed
display.debug("got an error while closing persistent connection: %s" % e)
self._final_q.put(_sentinel) self._final_q.put(_sentinel)
self._results_thread.join() self._results_thread.join()