summaryrefslogtreecommitdiff
path: root/app/models/user.rb
diff options
context:
space:
mode:
authorToon Claes <toon@gitlab.com>2017-05-02 22:52:14 +0200
committerToon Claes <toon@gitlab.com>2017-05-08 08:48:38 +0200
commit6a915d6f2d462a376d8cecc062dd58e520339b5e (patch)
treef1c27077f36a5505c24686d8ba7a8c83f49e9a36 /app/models/user.rb
parent8b9cd3c072768ca810d2b33009e35d93a05e417f (diff)
downloadgitlab-ce-6a915d6f2d462a376d8cecc062dd58e520339b5e.tar.gz
Limit `update_tracked_fields` to write to database once/hour
Every time a user logs in or out, the Trackable attributes are written to the database. This is causing a lot of load on the database, for data that isn't really critical. So to avoid the database being hammered, add a Gitlab::ExclusiveLease before writing trackable attributes to the database. This lease expires after an hour, so only when the attributes were written more than an hour ago, they can be written again. Otherwise they are ignored.
Diffstat (limited to 'app/models/user.rb')
-rw-r--r--app/models/user.rb10
1 files changed, 10 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index accaa91b805..05f636c020a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -40,6 +40,16 @@ class User < ActiveRecord::Base
devise :lockable, :recoverable, :rememberable, :trackable,
:validatable, :omniauthable, :confirmable, :registerable
+ # Limit trackable fields to update at most once every hour
+ alias_method :devise_update_tracked_fields!, :update_tracked_fields!
+
+ def update_tracked_fields!(request)
+ lease = Gitlab::ExclusiveLease.new("user_update_tracked_fields:#{id}", timeout: 1.hour.to_i)
+ return unless lease.try_obtain
+
+ devise_update_tracked_fields!(request)
+ end
+
attr_accessor :force_random_password
# Virtual attribute for authenticating by either username or email