diff options
-rw-r--r-- | lib/gitlab/authorized_keys.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lib/gitlab/authorized_keys.rb b/lib/gitlab/authorized_keys.rb index 711d0464087..609d2bd9c77 100644 --- a/lib/gitlab/authorized_keys.rb +++ b/lib/gitlab/authorized_keys.rb @@ -102,12 +102,10 @@ module Gitlab def lock(timeout = 10) File.open("#{authorized_keys_file}.lock", "w+") do |f| - begin - f.flock File::LOCK_EX - Timeout.timeout(timeout) { yield } - ensure - f.flock File::LOCK_UN - end + f.flock File::LOCK_EX + Timeout.timeout(timeout) { yield } + ensure + f.flock File::LOCK_UN end end |