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

Further cleanup from locking changes

Browse source
This commit is contained in:
James Cammarata 2015-09-03 01:07:29 -04:00
parent b93f27e260
commit 9e1bc434c7
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/executor/task_queue_manager.py
View file

@ -87,6 +87,8 @@ class TaskQueueManager:
except ValueError: except ValueError:
fileno = None fileno = None
# A temporary file (opened pre-fork) used by connection
# plugins for inter-process locking.
self._connection_lockfile = tempfile.TemporaryFile() self._connection_lockfile = tempfile.TemporaryFile()
self._workers = [] self._workers = []

9
lib/ansible/playbook/play_context.py
View file

@ -161,6 +161,7 @@ class PlayContext(Base):
_private_key_file = FieldAttribute(isa='string', default=C.DEFAULT_PRIVATE_KEY_FILE) _private_key_file = FieldAttribute(isa='string', default=C.DEFAULT_PRIVATE_KEY_FILE)
_timeout = FieldAttribute(isa='int', default=C.DEFAULT_TIMEOUT) _timeout = FieldAttribute(isa='int', default=C.DEFAULT_TIMEOUT)
_shell = FieldAttribute(isa='string') _shell = FieldAttribute(isa='string')
_connection_lockfd= FieldAttribute(isa='int')
# privilege escalation fields # privilege escalation fields
_become = FieldAttribute(isa='bool') _become = FieldAttribute(isa='bool')
@ -199,8 +200,7 @@ class PlayContext(Base):
self.password = passwords.get('conn_pass','') self.password = passwords.get('conn_pass','')
self.become_pass = passwords.get('become_pass','') self.become_pass = passwords.get('become_pass','')
# A temporary file (opened pre-fork) used by connection # a file descriptor to be used during locking operations
# plugins for inter-process locking.
self.connection_lockfd = connection_lockfd self.connection_lockfd = connection_lockfd
# set options before play to allow play to override them # set options before play to allow play to override them
@ -326,11 +326,6 @@ class PlayContext(Base):
return new_info return new_info
def copy(self, exclude_block=False):
new_me = super(PlayContext, self).copy()
new_me.connection_lockfd = self.connection_lockfd
return new_me
def make_become_cmd(self, cmd, executable=None): def make_become_cmd(self, cmd, executable=None):
""" helper function to create privilege escalation commands """ """ helper function to create privilege escalation commands """