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
1	1	class ApplicationController < ActionController::Base
2	2	before_filter :authenticate_user!
3	3	before_filter :reject_blocked!
4		- before_filter :set_current_user_for_observers
	4	+ before_filter :set_current_user_for_thread
5	5	before_filter :add_abilities
6	6	before_filter :dev_tools if Rails.env == 'development'
7	7	before_filter :default_headers
...	...	@@ -47,9 +47,8 @@ class ApplicationController < ActionController::Base
47	47	end
48	48	end
49	49
50		- def set_current_user_for_observers
51		- MergeRequestObserver.current_user = current_user
52		- IssueObserver.current_user = current_user
	50	+ def set_current_user_for_thread
	51	+ Thread.current[:current_user] = current_user
53	52	end
54	53
55	54	def abilities
...	...
...	...	@@ -6,4 +6,8 @@ class BaseObserver < ActiveRecord::Observer
6	6	def log_info message
7	7	Gitlab::AppLogger.info message
8	8	end
	9	+
	10	+ def current_user
	11	+ Thread.current[:current_user]
	12	+ end
9	13	end
...	...
1	1	class IssueObserver < BaseObserver
2		- cattr_accessor :current_user
3		-
4	2	def after_create(issue)
5	3	notification.new_issue(issue, current_user)
6	4	end
...	...
1	1	class MergeRequestObserver < BaseObserver
2		- cattr_accessor :current_user
3		-
4	2	def after_create(merge_request)
5	3	notification.new_merge_request(merge_request, current_user)
6	4	end
...	...
...	...	@@ -6,7 +6,7 @@ production:
6	6	encoding: utf8
7	7	reconnect: false
8	8	database: gitlabhq_production
9		- pool: 5
	9	+ pool: 10
10	10	username: root
11	11	password: "secure password"
12	12	# host: localhost
...	...
...	...	@@ -5,7 +5,7 @@ production:
5	5	adapter: postgresql
6	6	encoding: unicode
7	7	database: gitlabhq_production
8		- pool: 5
	8	+ pool: 10
9	9	username: git
10	10	password:
11	11	# host: localhost
...	...
...	...	@@ -52,7 +52,7 @@ Gitlab::Application.configure do
52	52	# config.action_mailer.raise_delivery_errors = false
53	53
54	54	# Enable threaded mode
55		- # config.threadsafe!
	55	+ config.threadsafe!
56	56
57	57	# Enable locale fallbacks for I18n (makes lookups for any locale fall back to
58	58	# the I18n.default_locale when a translation can not be found)
...	...
...	...	@@ -6,3 +6,8 @@ module Gitlab
6	6	Settings
7	7	end
8	8	end
	9	+
	10	+#
	11	+# Load all libs for threadsafety
	12	+#
	13	+Dir["#{Rails.root}/lib/*/.rb"].each { \|file\| require file }
...	...
...	...	@@ -2,6 +2,7 @@ module API
2	2	# Issues API
3	3	class Issues < Grape::API
4	4	before { authenticate! }
	5	+ before { Thread.current[:current_user] = current_user }
5	6
6	7	resource :issues do
7	8	# Get currently authenticated user's issues
...	...	@@ -79,7 +80,7 @@ module API
79	80
80	81	attrs = attributes_for_keys [:title, :description, :assignee_id, :milestone_id, :state_event]
81	82	attrs[:label_list] = params[:labels] if params[:labels].present?
82		- IssueObserver.current_user = current_user
	83	+
83	84	if @issue.update_attributes attrs
84	85	present @issue, with: Entities::Issue
85	86	else
...	...
...	...	@@ -2,6 +2,7 @@ module API
2	2	# MergeRequest API
3	3	class MergeRequests < Grape::API
4	4	before { authenticate! }
	5	+ before { Thread.current[:current_user] = current_user }
5	6
6	7	resource :projects do
7	8	helpers do
...	...	@@ -94,8 +95,6 @@ module API
94	95
95	96	authorize! :modify_merge_request, merge_request
96	97
97		- MergeRequestObserver.current_user = current_user
98		-
99	98	if merge_request.update_attributes attrs
100	99	merge_request.reload_code
101	100	merge_request.mark_as_unchecked
...	...