Download as
Browse Code »

Commit 993af5d0d2d596040195c4109c531c33deeac026

Authored by Dmitriy Zaporozhets
1 parent 5511a731
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

cattr_accessor is not threadsafe!

Showing 9 changed files with 12 additions and 14 deletions   Show diff stats
app/controllers/application_controller.rb
  Diff comments   View file @993af5d
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 &lt; 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
... ...
app/observers/base_observer.rb
  Diff comments   View file @993af5d
... ... @@ -6,4 +6,8 @@ class BaseObserver &lt; 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
... ...
app/observers/issue_observer.rb
  Diff comments   View file @993af5d
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
... ...
app/observers/merge_request_observer.rb
  Diff comments   View file @993af5d
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
... ...
config/database.yml.mysql
  Diff comments   View file @993af5d
... ... @@ -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
... ...
config/database.yml.postgresql
  Diff comments   View file @993af5d
... ... @@ -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
... ...
lib/api/issues.rb
  Diff comments   View file @993af5d
... ... @@ -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
... ...
lib/api/merge_requests.rb
  Diff comments   View file @993af5d
... ... @@ -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
... ...
spec/models/milestone_spec.rb
  Diff comments   View file @993af5d
... ... @@ -39,7 +39,6 @@ describe Milestone do
39 39 end
40 40  
41 41 it "should count closed issues" do
42   - IssueObserver.current_user = issue.author
43 42 issue.close
44 43 milestone.issues << issue
45 44 milestone.percent_complete.should == 100
... ...