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

Unlock the file explicitly due to some weirdness on BSD kernels

This commit is contained in:
Mitchell Hashimoto 2013-01-28 21:08:22 -08:00
parent 7531c94dbf
commit e1b78dbfbe
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/vagrant/action/builtin/lock.rb
View File

@ -1,3 +1,5 @@
require "log4r"
module Vagrant module Vagrant
module Action module Action
module Builtin module Builtin
@ -6,6 +8,7 @@ module Vagrant
class Lock class Lock
def initialize(app, env, options=nil) def initialize(app, env, options=nil)
@app = app @app = app
@logger = Log4r::Logger.new("vagrant::action::builtin::lock")
@options ||= options || {} @options ||= options || {}
raise ArgumentError, "Please specify a lock path" if !@options[:path] raise ArgumentError, "Please specify a lock path" if !@options[:path]
raise ArgumentError, "Please specify an exception." if !@options[:exception] raise ArgumentError, "Please specify an exception." if !@options[:exception]
@ -25,6 +28,7 @@ module Vagrant
# The file locking fails only if it returns "false." If it # The file locking fails only if it returns "false." If it
# succeeds it returns a 0, so we must explicitly check for # succeeds it returns a 0, so we must explicitly check for
# the proper error case. # the proper error case.
@logger.info("Locking: #{lock_path}")
if f.flock(File::LOCK_EX | File::LOCK_NB) === false if f.flock(File::LOCK_EX | File::LOCK_NB) === false
exception = @options[:exception] exception = @options[:exception]
exception = exception.call(env) if exception.is_a?(Proc) exception = exception.call(env) if exception.is_a?(Proc)
@ -37,7 +41,9 @@ module Vagrant
env[env_key] = true env[env_key] = true
@app.call(env) @app.call(env)
ensure ensure
@logger.info("Unlocking: #{lock_path}")
env[env_key] = false env[env_key] = false
f.flock(File::LOCK_UN)
end end
end end
else else