From 3c4689c23c9d6f50e9facb48a8dc0a7344764ebf Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Wed, 26 Jun 2013 18:35:32 +0300 Subject: [PATCH] Store satellites lock files inside satellites dir --- lib/gitlab/satellite/satellite.rb | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index 668de75..4c7be04 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -64,7 +64,8 @@ module Gitlab end def lock_file - Rails.root.join("tmp", "satellite_#{project.id}.lock") + create_locks_dir unless File.exists?(lock_files_dir) + File.join(lock_files_dir, "satellite_#{project.id}.lock") end def path @@ -114,6 +115,16 @@ module Gitlab def update_from_source! repo.git.fetch({timeout: true}, :origin) end + + # Create directory for stroing + # satellites lock files + def create_locks_dir + FileUtils.mkdir_p(lock_files_dir) + end + + def lock_files_dir + @lock_files_dir ||= File.join(Gitlab.config.satellites.path, "tmp") + end end end end -- libgit2 0.21.2