Merge branch 'feature/threadsafe' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 159eee8d 993af5d0
Showing 11 changed files with 18 additions and 15 deletions Show diff stats
app/controllers/application_controller.rb
app/observers/base_observer.rb
app/observers/issue_observer.rb
app/observers/merge_request_observer.rb
config/database.yml.mysql
config/database.yml.postgresql
config/environments/production.rb
config/initializers/2_app.rb
lib/api/issues.rb
lib/api/merge_requests.rb
spec/models/milestone_spec.rb
 class ApplicationController < ActionController::Base
   before_filter :authenticate_user!
   before_filter :reject_blocked!
-  before_filter :set_current_user_for_observers
+  before_filter :set_current_user_for_thread
   before_filter :add_abilities
   before_filter :dev_tools if Rails.env == 'development'
   before_filter :default_headers
@@ -47,9 +47,8 @@ class ApplicationController &lt; ActionController::Base
     end
   end
-  def set_current_user_for_observers
-    MergeRequestObserver.current_user = current_user
-    IssueObserver.current_user = current_user
+  def set_current_user_for_thread
+    Thread.current[:current_user] = current_user
   end
   def abilities
@@ -6,4 +6,8 @@ class BaseObserver &lt; ActiveRecord::Observer
   def log_info message
     Gitlab::AppLogger.info message
   end
+
+  def current_user
+    Thread.current[:current_user]
+  end
 end
 class IssueObserver < BaseObserver
-  cattr_accessor :current_user
-
   def after_create(issue)
     notification.new_issue(issue, current_user)
   end
 class MergeRequestObserver < BaseObserver
-  cattr_accessor :current_user
-
   def after_create(merge_request)
     notification.new_merge_request(merge_request, current_user)
   end
@@ -6,7 +6,7 @@ production:
   encoding: utf8
   reconnect: false
   database: gitlabhq_production
-  pool: 5
+  pool: 10
   username: root
   password: "secure password"
   # host: localhost
@@ -5,7 +5,7 @@ production:
   adapter: postgresql
   encoding: unicode
   database: gitlabhq_production
-  pool: 5
+  pool: 10
   username: git
   password:
   # host: localhost
@@ -52,7 +52,7 @@ Gitlab::Application.configure do
   # config.action_mailer.raise_delivery_errors = false
   # Enable threaded mode
-  # config.threadsafe!
+  config.threadsafe!
   # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
   # the I18n.default_locale when a translation can not be found)
@@ -6,3 +6,8 @@ module Gitlab
     Settings
   end
 end
+
+#
+# Load all libs for threadsafety
+#
+Dir["#{Rails.root}/lib/**/*.rb"].each { |file| require file }
@@ -2,6 +2,7 @@ module API
   # Issues API
   class Issues < Grape::API
     before { authenticate! }
+    before { Thread.current[:current_user] = current_user }
     resource :issues do
       # Get currently authenticated user's issues
@@ -79,7 +80,7 @@ module API
         attrs = attributes_for_keys [:title, :description, :assignee_id, :milestone_id, :state_event]
         attrs[:label_list] = params[:labels] if params[:labels].present?
-        IssueObserver.current_user = current_user
+
         if @issue.update_attributes attrs
           present @issue, with: Entities::Issue
         else
@@ -2,6 +2,7 @@ module API
   # MergeRequest API
   class MergeRequests < Grape::API
     before { authenticate! }
+    before { Thread.current[:current_user] = current_user }
     resource :projects do
       helpers do
@@ -94,8 +95,6 @@ module API
         authorize! :modify_merge_request, merge_request
-        MergeRequestObserver.current_user = current_user
-
         if merge_request.update_attributes attrs
           merge_request.reload_code
           merge_request.mark_as_unchecked
@@ -39,7 +39,6 @@ describe Milestone do
     end
     it "should count closed issues" do
-      IssueObserver.current_user = issue.author
       issue.close
       milestone.issues << issue
       milestone.percent_complete.should == 100
	@@ -6,4 +6,8 @@ class BaseObserver < ActiveRecord::Observer		@@ -6,4 +6,8 @@ class BaseObserver < ActiveRecord::Observer
6	def log_info message	6	def log_info message
7	Gitlab::AppLogger.info message	7	Gitlab::AppLogger.info message
8	end	8	end
		9	+
		10	+ def current_user
		11	+ Thread.current[:current_user]
		12	+ end
9	end	13	end
1	class IssueObserver < BaseObserver	1	class IssueObserver < BaseObserver
2	- cattr_accessor :current_user
3	-
4	def after_create(issue)	2	def after_create(issue)
5	notification.new_issue(issue, current_user)	3	notification.new_issue(issue, current_user)
6	end	4	end
1	class MergeRequestObserver < BaseObserver	1	class MergeRequestObserver < BaseObserver
2	- cattr_accessor :current_user
3	-
4	def after_create(merge_request)	2	def after_create(merge_request)
5	notification.new_merge_request(merge_request, current_user)	3	notification.new_merge_request(merge_request, current_user)
6	end	4	end
	@@ -6,7 +6,7 @@ production:		@@ -6,7 +6,7 @@ production:
6	encoding: utf8	6	encoding: utf8
7	reconnect: false	7	reconnect: false
8	database: gitlabhq_production	8	database: gitlabhq_production
9	- pool: 5	9	+ pool: 10
10	username: root	10	username: root
11	password: "secure password"	11	password: "secure password"
12	# host: localhost	12	# host: localhost
	@@ -5,7 +5,7 @@ production:		@@ -5,7 +5,7 @@ production:
5	adapter: postgresql	5	adapter: postgresql
6	encoding: unicode	6	encoding: unicode
7	database: gitlabhq_production	7	database: gitlabhq_production
8	- pool: 5	8	+ pool: 10
9	username: git	9	username: git
10	password:	10	password:
11	# host: localhost	11	# host: localhost
	@@ -52,7 +52,7 @@ Gitlab::Application.configure do		@@ -52,7 +52,7 @@ Gitlab::Application.configure do
52	# config.action_mailer.raise_delivery_errors = false	52	# config.action_mailer.raise_delivery_errors = false
53		53
54	# Enable threaded mode	54	# Enable threaded mode
55	- # config.threadsafe!	55	+ config.threadsafe!
56		56
57	# Enable locale fallbacks for I18n (makes lookups for any locale fall back to	57	# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
58	# the I18n.default_locale when a translation can not be found)	58	# the I18n.default_locale when a translation can not be found)
	@@ -6,3 +6,8 @@ module Gitlab		@@ -6,3 +6,8 @@ module Gitlab
6	Settings	6	Settings
7	end	7	end
8	end	8	end
		9	+
		10	+#
		11	+# Load all libs for threadsafety
		12	+#
		13	+Dir["#{Rails.root}/lib/*/.rb"].each { \|file\| require file }
	@@ -39,7 +39,6 @@ describe Milestone do		@@ -39,7 +39,6 @@ describe Milestone do
39	end	39	end
40		40
41	it "should count closed issues" do	41	it "should count closed issues" do
42	- IssueObserver.current_user = issue.author
43	issue.close	42	issue.close
44	milestone.issues << issue	43	milestone.issues << issue
45	milestone.percent_complete.should == 100	44	milestone.percent_complete.should == 100