Commit 4d37329c authored by Kevin Lynch's avatar Kevin Lynch

Must ensure that the lock is always removed.

parent ef2bf152
......@@ -27,13 +27,16 @@ class Gitosis
def configure
status = Timeout::timeout(20) do
File.open(File.join(Dir.tmpdir,"gitlabhq-gitosis.lock"), "w+") do |f|
f.flock(File::LOCK_EX)
begin
f.flock(File::LOCK_EX)
pull
yield(self)
push
pull
yield(self)
push
f.flock(File::LOCK_UN)
ensure
f.flock(File::LOCK_UN)
end
end
end
rescue Exception => ex
......
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