Extract lock namespace

ontohub · May 31, 2016 · 55e3375 · 55e3375
1 parent f829afd
commit 55e3375
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/git/lib/git_update.rb b/git/lib/git_update.rb
@@ -1,6 +1,7 @@
 require 'json'
 require File.join(File.expand_path('../../../lib', __FILE__), 'subprocess')
 require 'ontohub_net'
+require File.join(File.expand_path('../../../lib', __FILE__), 'git_repository')
 
 class GitUpdate
 
@@ -26,7 +27,7 @@ def initialize(repo_path, key_id, refs)
   end
 
   def exec
-    Semaphore.exclusively("action:#{@repo_name}") do
+    Semaphore.exclusively("#{GitRepository::LOCK_NAMESPACE}:#{@repo_name}") do
       exec_without_lock
     end
   end

diff --git a/lib/git_repository.rb b/lib/git_repository.rb
@@ -3,6 +3,8 @@
 class GitRepository
   require 'git_repository/config'
 
+  LOCK_NAMESPACE = "git"
+
   include \
     Config,
     Cloning,

diff --git a/lib/git_repository/commit.rb b/lib/git_repository/commit.rb
@@ -15,7 +15,7 @@ def add_file(userinfo, tmp_path, target_path, message, &block)
   end
 
   def commit_file(userinfo, file_contents, target_path, message, &block)
-    Semaphore.exclusively("action:#{repo}") do
+    Semaphore.exclusively("#{GitRepository::LOCK_NAMESPACE}:#{repo}") do
       commit_file_without_lock(userinfo,
                                file_contents,
                                target_path,