Merge pull request coderwall#166 from just3ws/activate_pending_users

seuros · seuros · commit afa070da9f42 · 2014-08-11T19:22:41.000+01:00
Convert the Rake task that activated users to a Sidekiq worker
diff --git a/app/clock.rb b/app/clock.rb
@@ -6,7 +6,11 @@
 include Clockwork
 
 
-every(1.day, 'award:activate:active', at: '00:00') {   }
+# Runs as 1:01 AM Pacific
+every(1.day, 'award:activate:active', at: '01:01') do
+  ActivatePendingUsersWorker.perform_async
+end
+
 every(1.day, 'award:fresh:stale', at: '00:00') {}
 every(1.day, 'cleanup:protips:associate_zombie_upvotes', at: '00:00') {}
 every(1.day, 'clear_expired_sessions', at: '00:00') {}
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -139,7 +139,7 @@ def banned?
   def activate
     UserActivateWorker.perform_async(id)
   end
-  
+
   def activate!
     # TODO: Switch to update, failing validations?
     update_attributes!(state: ACTIVE, activated_on: DateTime.now)
@@ -166,8 +166,6 @@ def oldest_achievement_since_last_visit
     badges.where("badges.created_at > ?", last_request_at).order('badges.created_at ASC').last
   end
 
-
-
   def company_name
     team.try(:name) || company
   end
@@ -177,7 +175,6 @@ def profile_url
     avatar_url
   end
 
-
   def can_be_refreshed?
     (achievements_checked_at.nil? || achievements_checked_at < 1.hour.ago)
   end
diff --git a/app/workers/activate_pending_users_worker.rb b/app/workers/activate_pending_users_worker.rb
@@ -0,0 +1,18 @@
+class ActivatePendingUsersWorker
+  include Sidekiq::Worker
+  sidekiq_options queue: :critical
+
+
+  def perform
+    # Spawning possibly many thousands
+    # of workers the order doesn't really matter
+    # but would like to spread their execution
+    # over the next hour to avoid overloading
+    # the database.
+    delay = 0
+    User.pending.find_each(batch_size: 100) do |user|
+      UserActivateWorker.perform_in(delay.minutes, user.id)
+      delay = delay + Random.rand(0..59)
+    end
+  end
+end
diff --git a/app/workers/user_activate_worker.rb b/app/workers/user_activate_worker.rb
@@ -1,4 +1,3 @@
-# UserActivateWorker
 class UserActivateWorker
   include Sidekiq::Worker
   sidekiq_options queue: :high
diff --git a/lib/tasks/award.rake b/lib/tasks/award.rake
diff --git a/script/ide b/script/ide
@@ -1,12 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Define session name
 
 SESSION=coderwall
 
 # Go to working directory
 
-cd ~/assemblymade/coderwall
+#cd ~/assemblymade/coderwall
 
 vagrant up --no-provision
 
@@ -27,7 +27,8 @@ tmux -2 new-session -d -s $SESSION
 # Create windows
 tmux new-window -t $SESSION:1 -n "code"
 tmux new-window -t $SESSION:2 -n "web"
-tmux new-window -t $SESSION:3 -n "background jobs"
+tmux new-window -t $SESSION:3 -n "sidekiq"
+tmux new-window -t $SESSION:4 -n "clock"
 
 # Define window roles
 
@@ -50,12 +51,17 @@ tmux select-pane -t 0
 #tmux send-keys "clear ; env bin/rails server webrick -p3000" C-m
 tmux send-keys "clear ; bundle exec puma -C ./config/puma.rb" C-m
 
-# Background Jobs
+# Sidekiq
 tmux select-window -t $SESSION:3
-
 tmux select-pane -t 0
 tmux send-keys "clear ; bundle exec sidekiq -C ./config/sidekiq.yml" C-m
 
+# Clock
+tmux select-window -t $SESSION:4
+tmux select-pane -t 0
+tmux send-keys "clear ; bundle exec clockwork app/clock.rb" C-m
+
+
 # Set the initial working window
 tmux select-window -t $SESSION:1
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# UserActivateWorker`
`2`	`1`	`class UserActivateWorker`
`3`	`2`	`include Sidekiq::Worker`
`4`	`3`	`sidekiq_options queue: :high`