Async perform for add/remove team members

Dmitriy Zaporozhets
1 parent 1c5876eb
Showing 5 changed files with 35 additions and 11 deletions Show diff stats
app/models/protected_branch.rb
app/models/users_project.rb
lib/gitlab/backend/gitolite.rb
spec/lib/gitolite_spec.rb
spec/support/stubbed_repository.rb
@@ -22,7 +22,7 @@ class ProtectedBranch &lt; ActiveRecord::Base
   after_destroy :update_repository
  
   def update_repository
-    gitolite.update_repository(project)
+    project.update_repository
   end
  
   def commit
@@ -82,9 +82,13 @@ class UsersProject &lt; ActiveRecord::Base
             users_project.save
           end
         end
-        Gitlab::Gitolite.new.update_repositories(Project.where(id: project_ids))
       end
  
+      GitoliteWorker.perform_async(
+        :update_repositories,
+        project_ids
+      )
+
       true
     rescue
       false
@@ -97,9 +101,13 @@ class UsersProject &lt; ActiveRecord::Base
           users_project.skip_git = true
           users_project.destroy
         end
-        Gitlab::Gitolite.new.update_repositories(Project.where(id: project_ids))
       end
  
+      GitoliteWorker.perform_async(
+        :update_repositories,
+        project_ids
+      )
+
       true
     rescue
       false
@@ -22,7 +22,12 @@ module Gitlab
       end
     end
  
-    def update_repository project_id
+    # Update project config in gitolite by project id
+    #
+    # Ex.
+    #   update_repository(23)
+    #
+    def update_repository(project_id)
       project = Project.find(project_id)
       config.update_project!(project)
     end
@@ -45,6 +50,19 @@ module Gitlab
       config.destroy_project!(name)
     end
  
+    # Update projects configs in gitolite by project ids
+    #
+    # Ex.
+    #   update_repositories([1, 4, 6])
+    #
+    def update_repositories(project_ids)
+      projects = Project.where(id: project_ids)
+
+      config.apply do |config|
+        config.update_projects(projects)
+      end
+    end
+
     def url_to_repo path
       Gitlab.config.gitolite.ssh_path_prefix + "#{path}.git"
     end
@@ -53,12 +71,6 @@ module Gitlab
       config.admin_all_repo!
     end
  
-    def update_repositories projects
-      config.apply do |config|
-        config.update_projects(projects)
-      end
-    end
-
     alias_method :create_repository, :update_repository
   end
 end
@@ -20,6 +20,6 @@ describe Gitlab::Gitolite do
  
   it "should call config update" do
     gitolite_config.should_receive(:update_project!)
-    gitolite.update_repository project
+    gitolite.update_repository(project.id)
   end
 end
@@ -21,6 +21,10 @@ class Project
       true
     end
  
+    def destroy
+      true
+    end
+
     def create
       true
     end
...	...	@@ -22,7 +22,7 @@ class ProtectedBranch < ActiveRecord::Base
22	22	after_destroy :update_repository
23	23
24	24	def update_repository
25		- gitolite.update_repository(project)
	25	+ project.update_repository
26	26	end
27	27
28	28	def commit
...	...
...	...	@@ -82,9 +82,13 @@ class UsersProject < ActiveRecord::Base
82	82	users_project.save
83	83	end
84	84	end
85		- Gitlab::Gitolite.new.update_repositories(Project.where(id: project_ids))
86	85	end
87	86
	87	+ GitoliteWorker.perform_async(
	88	+ :update_repositories,
	89	+ project_ids
	90	+ )
	91	+
88	92	true
89	93	rescue
90	94	false
...	...	@@ -97,9 +101,13 @@ class UsersProject < ActiveRecord::Base
97	101	users_project.skip_git = true
98	102	users_project.destroy
99	103	end
100		- Gitlab::Gitolite.new.update_repositories(Project.where(id: project_ids))
101	104	end
102	105
	106	+ GitoliteWorker.perform_async(
	107	+ :update_repositories,
	108	+ project_ids
	109	+ )
	110	+
103	111	true
104	112	rescue
105	113	false
...	...
...	...	@@ -22,7 +22,12 @@ module Gitlab
22	22	end
23	23	end
24	24
25		- def update_repository project_id
	25	+ # Update project config in gitolite by project id
	26	+ #
	27	+ # Ex.
	28	+ # update_repository(23)
	29	+ #
	30	+ def update_repository(project_id)
26	31	project = Project.find(project_id)
27	32	config.update_project!(project)
28	33	end
...	...	@@ -45,6 +50,19 @@ module Gitlab
45	50	config.destroy_project!(name)
46	51	end
47	52
	53	+ # Update projects configs in gitolite by project ids
	54	+ #
	55	+ # Ex.
	56	+ # update_repositories([1, 4, 6])
	57	+ #
	58	+ def update_repositories(project_ids)
	59	+ projects = Project.where(id: project_ids)
	60	+
	61	+ config.apply do \|config\|
	62	+ config.update_projects(projects)
	63	+ end
	64	+ end
	65	+
48	66	def url_to_repo path
49	67	Gitlab.config.gitolite.ssh_path_prefix + "#{path}.git"
50	68	end
...	...	@@ -53,12 +71,6 @@ module Gitlab
53	71	config.admin_all_repo!
54	72	end
55	73
56		- def update_repositories projects
57		- config.apply do \|config\|
58		- config.update_projects(projects)
59		- end
60		- end
61		-
62	74	alias_method :create_repository, :update_repository
63	75	end
64	76	end
...	...
...	...	@@ -20,6 +20,6 @@ describe Gitlab::Gitolite do
20	20
21	21	it "should call config update" do
22	22	gitolite_config.should_receive(:update_project!)
23		- gitolite.update_repository project
	23	+ gitolite.update_repository(project.id)
24	24	end
25	25	end
...	...
...	...	@@ -21,6 +21,10 @@ class Project
21	21	true
22	22	end
23	23
	24	+ def destroy
	25	+ true
	26	+ end
	27	+
24	28	def create
25	29	true
26	30	end
...	...