deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

MR: change path to lock file

Browse source
This commit is contained in:
Valery Sizov 2012-04-27 01:09:23 +03:00
parent ff8136cda2
commit 903f9491ba
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/gitlab_merge.rb
View file

@ -26,11 +26,9 @@ class GitlabMerge
def process
Grit::Git.with_timeout(30.seconds) do
# Make sure tmp/merge_repo exists
lock_path = File.join(Rails.root, "tmp", "merge_repo")
FileUtils.mkdir_p(lock_path) unless File.exists?(File.join(Rails.root, "tmp", "merge_repo"))
lock_file = File.join(Rails.root, "tmp", "merge_repo_#{project.path}.lock")
File.open(File.join(lock_path, "#{project.path}.lock"), "w+") do |f|
File.open(lock_file, "w+") do |f|
f.flock(File::LOCK_EX)
unless project.satellite.exists?