Must ensure that the lock is always removed.

4d37329c · Kevin Lynch · ef2bf152 · 4d37329c
Commit 4d37329c authored Oct 17, 2011 by Kevin Lynch
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 5 deletions

lib/gitosis.rb lib/gitosis.rb +8 -5

No files found.
--- 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
+          pull
-        yield(self)
+          yield(self)
-        push
+          push
-        f.flock(File::LOCK_UN)
+        ensure
+          f.flock(File::LOCK_UN)
+        end
      end
    end
  rescue Exception => ex