diff --git a/Gemfile b/Gemfile index db85549..a0d5e75 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,8 @@ gem 'newrelic_rpm' gem 'mina', require: false gem 'mina-multistage', require: false -gem 'mina-unicorn', :require => false +gem 'mina-sidekiq', require: false +gem 'mina-unicorn', require: false group :development do gem 'spring' diff --git a/Gemfile.lock b/Gemfile.lock index 87691d9..4d75620 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -130,6 +130,8 @@ GEM rake mina-multistage (0.1.1) mina (>= 0.2.1) + mina-sidekiq (0.3.1) + mina mina-unicorn (0.0.4) mini_magick (4.1.0) mini_portile (0.6.2) @@ -320,6 +322,7 @@ DEPENDENCIES jquery-rails mina mina-multistage + mina-sidekiq mina-unicorn mini_magick mongoid diff --git a/config/deploy.rb b/config/deploy.rb index 2d2dfcd..80a7ace 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -7,6 +7,7 @@ require 'mina/rails' require 'mina/git' require 'mina/rvm' # for rvm support. (http://rvm.io) require 'mina/unicorn' +require 'mina_sidekiq/tasks' # Manually create these paths in shared/ (eg: shared/config/database.yml) in your server. # They will be linked in the 'deploy:link_shared_paths' step. @@ -47,6 +48,7 @@ task :deploy => :environment do to :launch do invoke :'unicorn:restart' + invoke :'sidekiq:restart' end end end diff --git a/config/sidekiq.yml b/config/sidekiq.yml index 10d5d64..b47f623 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -1,10 +1,4 @@ --- :concurrency: 2 -:pidfile: tmp/pids/sidekiq.pid -:logfile: log/sidekiq.log -staging: - :concurrency: 2 -production: - :concurrency: 2 :queues: - [default, 2]