diff --git a/app/controllers/tag_aliases_controller.rb b/app/controllers/tag_aliases_controller.rb index 805f1b9e1..9e098395a 100644 --- a/app/controllers/tag_aliases_controller.rb +++ b/app/controllers/tag_aliases_controller.rb @@ -36,7 +36,7 @@ class TagAliasesController < ApplicationController def approve @tag_alias = TagAlias.find(params[:id]) @tag_alias.update_column(:status, "queued") - @tag_alias.delay.process! + @tag_alias.delay(:queue => "default").process! respond_with(@tag_alias, :location => tag_alias_path(@tag_alias)) end diff --git a/app/controllers/tag_implications_controller.rb b/app/controllers/tag_implications_controller.rb index 46e721ef2..134970435 100644 --- a/app/controllers/tag_implications_controller.rb +++ b/app/controllers/tag_implications_controller.rb @@ -27,7 +27,7 @@ class TagImplicationsController < ApplicationController def approve @tag_implication = TagImplication.find(params[:id]) @tag_implication.update_column(:status, "queued") - @tag_implication.delay.process! + @tag_implication.delay(:queue => "default").process! respond_with(@tag_implication, :location => tag_implication_path(@tag_implication)) end end diff --git a/app/logical/alias_and_implication_importer.rb b/app/logical/alias_and_implication_importer.rb index 4e8c1125b..acb05b8df 100644 --- a/app/logical/alias_and_implication_importer.rb +++ b/app/logical/alias_and_implication_importer.rb @@ -40,11 +40,11 @@ private case token[0] when :create_alias tag_alias = TagAlias.create(:forum_topic_id => forum_id, :status => "pending", :antecedent_name => token[1], :consequent_name => token[2]) - tag_alias.delay.process! + tag_alias.delay(:queue => "default").process! when :create_implication tag_implication = TagImplication.create(:forum_topic_id => forum_id, :status => "pending", :antecedent_name => token[1], :consequent_name => token[2]) - tag_implication.delay.process! + tag_implication.delay(:queue => "default").process! when :remove_alias tag_alias = TagAlias.where("antecedent_name = ?", token[1]).first diff --git a/app/models/artist.rb b/app/models/artist.rb index 2eff57b74..821f1c16e 100644 --- a/app/models/artist.rb +++ b/app/models/artist.rb @@ -181,7 +181,7 @@ class Artist < ActiveRecord::Base # potential race condition but unlikely unless TagImplication.where(:antecedent_name => name, :consequent_name => "banned_artist").exists? tag_implication = TagImplication.create(:antecedent_name => name, :consequent_name => "banned_artist") - tag_implication.delay.process! + tag_implication.delay(:queue => "default").process! end update_column(:is_active, false) diff --git a/app/models/tag.rb b/app/models/tag.rb index 0bd709cda..4f62cfcd5 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -373,7 +373,7 @@ class Tag < ActiveRecord::Base if post_count < 100 update_related else - delay.update_related + delay(:queue => "default").update_related end end end diff --git a/config/deploy.rb b/config/deploy.rb index b8e123b48..e71801dc2 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -105,7 +105,7 @@ end namespace :delayed_job do desc "Start delayed_job process" task :start, :roles => :app do - run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec ruby script/delayed_job --queue=`hostname` start" + run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec ruby script/delayed_job --queues=default,`hostname` start" end desc "Stop delayed_job process"