Must ensure that the lock is always removed.

Kevin Lynch
1 parent ef2bf152
Showing 1 changed file with 8 additions and 5 deletions Show diff stats
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