haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove Mutex for synchronization. Environment#lock satisfies requirement.

This commit is contained in:
Chris Roberts 2019-03-15 08:29:10 -07:00
parent 6664936c0b
commit c251e090b3
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/providers/docker/action/network.rb
View File

@ -7,7 +7,6 @@ module VagrantPlugins
def initialize(app, env)
@app = app
@logger = Log4r::Logger.new('vagrant::plugins::docker::network')
@@lock = Mutex.new
end
# @param[Hash] options - options from the network config
@ -81,14 +80,12 @@ module VagrantPlugins
end
container_id = machine.id
@@lock.synchronize do
machine.env.lock("docker-network-create", retry: true) do
if !machine.provider.driver.existing_network?(network_name)
@logger.debug("Creating network #{network_name}")
machine.provider.driver.create_network(network_name, cli_opts)
else
@logger.debug("Network #{network_name} already created")
end
machine.env.lock("docker-network-create", retry: true) do
if !machine.provider.driver.existing_network?(network_name)
@logger.debug("Creating network #{network_name}")
machine.provider.driver.create_network(network_name, cli_opts)
else
@logger.debug("Network #{network_name} already created")
end
end