Merge branch 'sidekiq'

Author: dzaporozhets

Gemfile

@@ -81,8 +81,9 @@ gem "acts-as-taggable-on", "2.3.3"
 gem "draper", "~> 0.18.0"
 
 # Background jobs
-gem "resque", git: "https://github.com/gitlabhq/resque.git", ref: "9ef4700306dd946a3ac000612428967ce0c32213"
-gem 'resque_mailer'
+gem 'slim'
+gem 'sinatra', :require => nil
+gem 'sidekiq', '2.6.4'
 
 # HTTP requests
 gem "httparty"
@@ -157,7 +158,6 @@ group :test do
   gem "simplecov", require: false
   gem "shoulda-matchers", "1.3.0"
   gem 'email_spec'
-  gem 'resque_spec'
   gem "webmock"
   gem 'test_after_commit'
 end

Gemfile.lock

@@ -54,17 +54,6 @@ GIT
   specs:
     raphael-rails (2.1.0)
 
-GIT
-  remote: https://github.com/gitlabhq/resque.git
-  revision: 9ef4700306dd946a3ac000612428967ce0c32213
-  ref: 9ef4700306dd946a3ac000612428967ce0c32213
-  specs:
-    resque (2.0.0.pre.1)
-      json
-      redis-namespace (~> 1.0)
-      sinatra (>= 0.9.2)
-      vegas (~> 0.1.2)
-
 GIT
   remote: https://github.com/jonleighton/poltergeist.git
   revision: 5c2e092001074a8cf09f332d3714e9ba150bc8ca
@@ -132,6 +121,9 @@ GEM
     carrierwave (0.7.1)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
+    celluloid (0.12.4)
+      facter (>= 1.6.12)
+      timers (>= 1.0.0)
     charlock_holmes (0.6.9)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
@@ -150,6 +142,7 @@ GEM
     coffee-script-source (1.4.0)
     colored (1.2)
     colorize (0.5.8)
+    connection_pool (1.0.0)
     crack (0.3.1)
     daemons (1.1.9)
     devise (2.1.2)
@@ -169,6 +162,7 @@ GEM
     eventmachine (1.0.0)
     execjs (1.4.0)
       multi_json (~> 1.0)
+    facter (1.6.17)
     factory_girl (4.1.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.1.0)
@@ -370,11 +364,6 @@ GEM
     redis (3.0.2)
     redis-namespace (1.2.1)
       redis (~> 3.0.0)
-    resque_mailer (2.1.0)
-      actionmailer (~> 3.0)
-    resque_spec (0.12.5)
-      resque (>= 1.19.0)
-      rspec (>= 2.5.0)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -412,6 +401,12 @@ GEM
     sexp_processor (4.1.3)
     shoulda-matchers (1.3.0)
       activesupport (>= 3.0.0)
+    sidekiq (2.6.4)
+      celluloid (~> 0.12.0)
+      connection_pool (~> 1.0)
+      multi_json (~> 1)
+      redis (~> 3)
+      redis-namespace
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
@@ -421,6 +416,9 @@ GEM
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
     six (0.2.0)
+    slim (1.3.6)
+      temple (~> 0.5.5)
+      tilt (~> 1.3.3)
     slop (3.3.3)
     spinach (0.5.2)
       colorize
@@ -435,6 +433,7 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     stamp (0.3.0)
+    temple (0.5.5)
     test_after_commit (0.0.1)
     therubyracer (0.10.2)
       libv8 (~> 3.3.10)
@@ -444,6 +443,7 @@ GEM
       rack (>= 1.0.0)
     thor (0.16.0)
     tilt (1.3.3)
+    timers (1.0.2)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
@@ -455,8 +455,6 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    vegas (0.1.11)
-      rack (>= 1.0.0)
     virtus (0.5.2)
       backports (~> 2.6.1)
     warden (1.2.1)
@@ -534,17 +532,17 @@ DEPENDENCIES
   rb-fsevent
   rb-inotify
   redcarpet (~> 2.2.2)
-  resque!
-  resque_mailer
-  resque_spec
   rspec-rails
   sass-rails (~> 3.2.5)
   sdoc
   seed-fu
   settingslogic
   shoulda-matchers (= 1.3.0)
+  sidekiq (= 2.6.4)
   simplecov
+  sinatra
   six
+  slim
   spinach-rails
   stamp
   test_after_commit

Procfile

@@ -1,2 +1,2 @@
 web: bundle exec rails s -p $PORT
-worker: bundle exec rake environment resque:work QUEUE=* VVERBOSE=1
+worker: bundle exec sidekiq -q post_receive,mailer,system_hook,common,default

app/controllers/admin/dashboard_controller.rb

@@ -3,10 +3,6 @@ def index
     @projects = Project.order("created_at DESC").limit(10)
     @users = User.order("created_at DESC").limit(10)
 
-    @resque_accessible = true
-    @workers = Resque.workers
-    @pending_jobs = Resque.size(:post_receive)
-
   rescue Redis::InheritedError
     @resque_accessible = false
   end

app/mailers/notify.rb

@@ -1,5 +1,5 @@
 class Notify < ActionMailer::Base
-  include Resque::Mailer
+
   add_template_helper ApplicationHelper
   add_template_helper GitlabMarkdownHelper
 

app/models/project.rb

@@ -251,7 +251,7 @@ def items_for entity
 
   def send_move_instructions
     self.users_projects.each do |member|
-      Notify.project_was_moved_email(member.id).deliver
+      Notify.delay.project_was_moved_email(member.id)
     end
   end
 

app/models/system_hook.rb

@@ -19,6 +19,6 @@ def self.all_hooks_fire(data)
   end
 
   def async_execute(data)
-    Resque.enqueue(SystemHookWorker, id, data)
+    Sidekiq::Client.enqueue(SystemHookWorker, id, data)
   end
 end

app/observers/issue_observer.rb

@@ -3,7 +3,7 @@ class IssueObserver < ActiveRecord::Observer
 
   def after_create(issue)
     if issue.assignee && issue.assignee != current_user
-      Notify.new_issue_email(issue.id).deliver
+      Notify.delay.new_issue_email(issue.id)
     end
   end
 
@@ -16,7 +16,7 @@ def after_update(issue)
     if status
       Note.create_status_change_note(issue, current_user, status)
       [issue.author, issue.assignee].compact.each do |recipient|
-        Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user.id).deliver
+        Notify.delay.issue_status_changed_email(recipient.id, issue.id, status, current_user.id)
       end
     end
   end
@@ -27,7 +27,7 @@ def send_reassigned_email(issue)
     recipient_ids = [issue.assignee_id, issue.assignee_id_was].keep_if {|id| id && id != current_user.id }
 
     recipient_ids.each do |recipient_id|
-      Notify.reassigned_issue_email(recipient_id, issue.id, issue.assignee_id_was).deliver
+      Notify.delay.reassigned_issue_email(recipient_id, issue.id, issue.assignee_id_was)
     end
   end
 end

app/observers/merge_request_observer.rb

@@ -3,7 +3,7 @@ class MergeRequestObserver < ActiveRecord::Observer
 
   def after_create(merge_request)
     if merge_request.assignee && merge_request.assignee != current_user
-      Notify.new_merge_request_email(merge_request.id).deliver
+      Notify.delay.new_merge_request_email(merge_request.id)
     end
   end
 
@@ -25,7 +25,7 @@ def send_reassigned_email(merge_request)
     recipients_ids.delete current_user.id
 
     recipients_ids.each do |recipient_id|
-      Notify.reassigned_merge_request_email(recipient_id, merge_request.id, merge_request.assignee_id_was).deliver
+      Notify.delay.reassigned_merge_request_email(recipient_id, merge_request.id, merge_request.assignee_id_was)
     end
   end
 end

app/observers/note_observer.rb

@@ -11,7 +11,7 @@ def send_notify_mails(note)
       notify_team(note)
     elsif note.notify_author
       # Notify only author of resource
-      Notify.note_commit_email(note.commit_author.id, note.id).deliver
+      Notify.delay.note_commit_email(note.commit_author.id, note.id)
     else
       # Otherwise ignore it
       nil
@@ -26,7 +26,7 @@ def notify_team(note)
 
     if Notify.respond_to? notify_method
       team_without_note_author(note).map do |u|
-        Notify.send(notify_method, u.id, note.id).deliver
+        Notify.delay.send(notify_method, u.id, note.id)
       end
     end
   end

app/observers/user_observer.rb

@@ -2,7 +2,7 @@ class UserObserver < ActiveRecord::Observer
   def after_create(user)
     log_info("User \"#{user.name}\" (#{user.email}) was created")
 
-    Notify.new_user_email(user.id, user.password).deliver
+    Notify.delay.new_user_email(user.id, user.password)
   end
 
   def after_destroy user

app/observers/users_project_observer.rb

@@ -1,7 +1,7 @@
 class UsersProjectObserver < ActiveRecord::Observer
   def after_commit(users_project)
     return if users_project.destroyed?
-    Notify.project_access_granted_email(users_project.id).deliver
+    Notify.delay.project_access_granted_email(users_project.id)
   end
 
   def after_create(users_project)

app/views/admin/dashboard/index.html.haml

@@ -1,47 +1,28 @@
 .admin_dash.row
-  .span3
+  .span4
     .ui-box
       %h5.title Projects
       .data.padded
         = link_to admin_projects_path do
           %h1= Project.count
         %hr
         = link_to 'New Project', new_project_path, class: "btn small"
-  .span3
+  .span4
     .ui-box
       %h5.title Groups
       .data.padded
         = link_to admin_groups_path do
           %h1= Group.count
         %hr
         = link_to 'New Group', new_admin_group_path, class: "btn small"
-  .span3
+  .span4
     .ui-box
       %h5.title Users
       .data.padded
         = link_to admin_users_path do
           %h1= User.count
         %hr
         = link_to 'New User', new_admin_user_path, class: "btn small"
-  .span3
-    .ui-box
-      %h5.title
-        Resque Workers
-      .data.padded
-        - if @resque_accessible
-          = link_to admin_resque_path do
-            %h1{class: @workers.present? ? "cgreen" : "cred"}
-              = @workers.count
-          %hr
-          %p
-            %strong{class: @pending_jobs > 0 ? "cred" : "cgreen"}
-              #{@pending_jobs} post receive jobs waiting
-        - else
-          = link_to admin_resque_path do
-            %h1.cdark ?
-          %hr
-          %p
-            %strong Resque status unknown
 
 .row
   .span6

app/views/admin/resque/show.html.haml

@@ -1,4 +1,4 @@
-%h3.page_title Resque
+%h3.page_title Background Jobs
 %br
 .ui-box
-  %iframe{src: resque_path, width: '100%', height: 600, style: "border: none"}
+  %iframe{src: sidekiq_path, width: '100%', height: 900, style: "border: none"}

app/views/layouts/admin.html.haml

@@ -19,6 +19,6 @@
         = nav_link(controller: :hooks) do
           = link_to "Hooks", admin_hooks_path
         = nav_link(controller: :resque) do
-          = link_to "Resque", admin_resque_path
+          = link_to "Background Jobs", admin_resque_path
 
       .content= yield

app/workers/post_receive.rb

@@ -1,7 +1,9 @@
 class PostReceive
-  @queue = :post_receive
+  include Sidekiq::Worker
 
-  def self.perform(repo_path, oldrev, newrev, ref, identifier)
+  sidekiq_options queue: :post_receive
+
+  def perform(repo_path, oldrev, newrev, ref, identifier)
     repo_path.gsub!(Gitlab.config.gitolite.repos_path.to_s, "")
     repo_path.gsub!(/.git$/, "")
     repo_path.gsub!(/^\//, "")

app/workers/system_hook_worker.rb

@@ -1,7 +1,9 @@
 class SystemHookWorker
-  @queue = :system_hook
+  include Sidekiq::Worker
 
-  def self.perform(hook_id, data)
+  sidekiq_options queue: :system_hook
+
+  def perform(hook_id, data)
     SystemHook.find(hook_id).execute data
   end
 end