Must ensure that the lock is always removed.

2011-10-17 01:53:30 -04:00 · 2011-10-17 01:53:30 -04:00 · 4d37329c73
parent ef2bf15204
commit 4d37329c73
1 changed files with 8 additions and 5 deletions
--- a/lib/gitosis.rb
+++ b/lib/gitosis.rb
@ -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