Merge pull request gitlabhq#31 from klynch/1x

Must ensure that the lock is always removed.
dams · Oct 18, 2011 · 757ea63 · 757ea63
2 parents ef2bf15 + a39d043
commit 757ea63
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/app/models/project.rb b/app/models/project.rb
@@ -28,7 +28,7 @@ class Project < ActiveRecord::Base
             :uniqueness => true,
             :format => { :with => /^[a-zA-Z0-9_\-]*$/,
                          :message => "only letters, digits & '_' '-' allowed"  },
-            :length   => { :within => 3..16 }
+            :length   => { :within => 3..255 }
 
   validates :owner,
             :presence => true

diff --git a/lib/gitosis.rb b/lib/gitosis.rb
@@ -27,13 +27,16 @@ def push
   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