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

Must ensure that the lock is always removed.

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