Uninstall resque
Yay, we've deleted all our background tasks! We'll probably want to replace some of the basic functionality like certain caching? But we can deal with that as we run into it. The direct motivation here was a seeming version conflict between Rails 4.2's rack dependency and latest Resque's rack dependency... but this is just nice complexity elimination regardless, we want this anyway :3
This commit is contained in:
parent
225f784732
commit
8a20c9be02
14 changed files with 0 additions and 55 deletions
3
Gemfile
3
Gemfile
|
@ -25,9 +25,6 @@ gem 'addressable', :require => ['addressable/template', 'addressable/uri']
|
||||||
|
|
||||||
gem 'whenever', '~> 0.7.3', :require => false
|
gem 'whenever', '~> 0.7.3', :require => false
|
||||||
|
|
||||||
gem 'resque', '~> 1.23.0'
|
|
||||||
gem 'resque-scheduler', '~> 2.0.0.d'
|
|
||||||
|
|
||||||
gem 'right_aws', '~> 2.1.0'
|
gem 'right_aws', '~> 2.1.0'
|
||||||
|
|
||||||
gem "character-encodings", "~> 0.4.1", :platforms => :ruby_18
|
gem "character-encodings", "~> 0.4.1", :platforms => :ruby_18
|
||||||
|
|
23
Gemfile.lock
23
Gemfile.lock
|
@ -163,8 +163,6 @@ GEM
|
||||||
rack (1.5.5)
|
rack (1.5.5)
|
||||||
rack-attack (2.2.1)
|
rack-attack (2.2.1)
|
||||||
rack
|
rack
|
||||||
rack-protection (1.5.3)
|
|
||||||
rack
|
|
||||||
rack-test (0.6.3)
|
rack-test (0.6.3)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
rails (4.1.16)
|
rails (4.1.16)
|
||||||
|
@ -196,20 +194,8 @@ GEM
|
||||||
execjs
|
execjs
|
||||||
railties (>= 3.2)
|
railties (>= 3.2)
|
||||||
tilt
|
tilt
|
||||||
redis (3.2.1)
|
|
||||||
redis-namespace (1.5.2)
|
|
||||||
redis (~> 3.0, >= 3.0.4)
|
|
||||||
responders (1.1.2)
|
responders (1.1.2)
|
||||||
railties (>= 3.2, < 4.2)
|
railties (>= 3.2, < 4.2)
|
||||||
resque (1.23.1)
|
|
||||||
multi_json (~> 1.0)
|
|
||||||
redis-namespace (~> 1.0)
|
|
||||||
sinatra (>= 0.9.2)
|
|
||||||
vegas (~> 0.1.2)
|
|
||||||
resque-scheduler (2.0.1)
|
|
||||||
redis (>= 2.0.1)
|
|
||||||
resque (>= 1.20.0)
|
|
||||||
rufus-scheduler
|
|
||||||
rest-client (1.6.9)
|
rest-client (1.6.9)
|
||||||
mime-types (~> 1.16)
|
mime-types (~> 1.16)
|
||||||
right_aws (2.1.0)
|
right_aws (2.1.0)
|
||||||
|
@ -228,7 +214,6 @@ GEM
|
||||||
rspec-rails (2.0.1)
|
rspec-rails (2.0.1)
|
||||||
rspec (~> 2.0.0)
|
rspec (~> 2.0.0)
|
||||||
ruby-hmac (0.4.0)
|
ruby-hmac (0.4.0)
|
||||||
rufus-scheduler (3.1.3)
|
|
||||||
rvm-capistrano (1.5.6)
|
rvm-capistrano (1.5.6)
|
||||||
capistrano (~> 2.15.4)
|
capistrano (~> 2.15.4)
|
||||||
sanitize (2.0.6)
|
sanitize (2.0.6)
|
||||||
|
@ -240,10 +225,6 @@ GEM
|
||||||
sprockets (>= 2.8, < 4.0)
|
sprockets (>= 2.8, < 4.0)
|
||||||
sprockets-rails (>= 2.0, < 4.0)
|
sprockets-rails (>= 2.0, < 4.0)
|
||||||
tilt (>= 1.1, < 3)
|
tilt (>= 1.1, < 3)
|
||||||
sinatra (1.4.6)
|
|
||||||
rack (~> 1.4)
|
|
||||||
rack-protection (~> 1.4)
|
|
||||||
tilt (>= 1.3, < 3)
|
|
||||||
sprockets (3.7.2)
|
sprockets (3.7.2)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
rack (> 1, < 3)
|
rack (> 1, < 3)
|
||||||
|
@ -261,8 +242,6 @@ GEM
|
||||||
thread_safe (~> 0.1)
|
thread_safe (~> 0.1)
|
||||||
uglifier (4.2.0)
|
uglifier (4.2.0)
|
||||||
execjs (>= 0.3.0, < 3)
|
execjs (>= 0.3.0, < 3)
|
||||||
vegas (0.1.11)
|
|
||||||
rack (>= 1.0.0)
|
|
||||||
warden (1.2.7)
|
warden (1.2.7)
|
||||||
rack (>= 1.0)
|
rack (>= 1.0)
|
||||||
whenever (0.7.3)
|
whenever (0.7.3)
|
||||||
|
@ -304,8 +283,6 @@ DEPENDENCIES
|
||||||
rails-i18n (~> 4.0, >= 4.0.9)
|
rails-i18n (~> 4.0, >= 4.0.9)
|
||||||
rdiscount (~> 1.6.5)
|
rdiscount (~> 1.6.5)
|
||||||
react-rails (~> 2.7, >= 2.7.1)
|
react-rails (~> 2.7, >= 2.7.1)
|
||||||
resque (~> 1.23.0)
|
|
||||||
resque-scheduler (~> 2.0.0.d)
|
|
||||||
rest-client (~> 1.6.7)
|
rest-client (~> 1.6.7)
|
||||||
right_aws (~> 2.1.0)
|
right_aws (~> 2.1.0)
|
||||||
rspec-rails (~> 2.0.0.beta.22)
|
rspec-rails (~> 2.0.0.beta.22)
|
||||||
|
|
2
Rakefile
2
Rakefile
|
@ -6,8 +6,6 @@ require File.expand_path('../config/application', __FILE__)
|
||||||
require 'rake'
|
require 'rake'
|
||||||
require 'rake/testtask'
|
require 'rake/testtask'
|
||||||
require 'rdoc/task'
|
require 'rdoc/task'
|
||||||
require 'resque/tasks'
|
|
||||||
require 'resque_scheduler/tasks'
|
|
||||||
|
|
||||||
OpenneoImpressItems::Application.load_tasks
|
OpenneoImpressItems::Application.load_tasks
|
||||||
|
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
# Sometimes the Resque workers have trouble maintaining their connections to
|
|
||||||
# Redis and to the database. It's not entirely clear when and why (though the
|
|
||||||
# internet suggests that it has to do with lying dormant for too long), but
|
|
||||||
# this fix ensures that Redis and the database are available at the start of
|
|
||||||
# every job.
|
|
||||||
Resque.after_fork do
|
|
||||||
Resque.redis.client.reconnect
|
|
||||||
ActiveRecord::Base.connection_handler.verify_active_connections!
|
|
||||||
end
|
|
|
@ -1,5 +1,3 @@
|
||||||
require 'resque/server'
|
|
||||||
|
|
||||||
OpenneoImpressItems::Application.routes.draw do
|
OpenneoImpressItems::Application.routes.draw do
|
||||||
get "petpages/new"
|
get "petpages/new"
|
||||||
|
|
||||||
|
@ -102,16 +100,4 @@ OpenneoImpressItems::Application.routes.draw do
|
||||||
|
|
||||||
get '/sitemap.xml' => 'sitemap#index', :as => :sitemap, :format => :xml
|
get '/sitemap.xml' => 'sitemap#index', :as => :sitemap, :format => :xml
|
||||||
get '/robots.txt' => 'sitemap#robots', :as => :robots, :format => :text
|
get '/robots.txt' => 'sitemap#robots', :as => :robots, :format => :text
|
||||||
|
|
||||||
def mount_resque
|
|
||||||
mount Resque::Server, :at => '/resque'
|
|
||||||
end
|
|
||||||
|
|
||||||
if Rails.env.development?
|
|
||||||
mount_resque
|
|
||||||
else
|
|
||||||
authenticated :user, lambda { |u| u.admin? } do
|
|
||||||
mount_resque
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
end
|
|
@ -1,4 +0,0 @@
|
||||||
require 'resque/tasks'
|
|
||||||
|
|
||||||
task "resque:setup" => :environment
|
|
||||||
|
|
BIN
vendor/cache/rack-protection-1.5.3.gem
vendored
BIN
vendor/cache/rack-protection-1.5.3.gem
vendored
Binary file not shown.
BIN
vendor/cache/redis-3.2.1.gem
vendored
BIN
vendor/cache/redis-3.2.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/redis-namespace-1.5.2.gem
vendored
BIN
vendor/cache/redis-namespace-1.5.2.gem
vendored
Binary file not shown.
BIN
vendor/cache/resque-1.23.1.gem
vendored
BIN
vendor/cache/resque-1.23.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/resque-scheduler-2.0.1.gem
vendored
BIN
vendor/cache/resque-scheduler-2.0.1.gem
vendored
Binary file not shown.
BIN
vendor/cache/rufus-scheduler-3.1.3.gem
vendored
BIN
vendor/cache/rufus-scheduler-3.1.3.gem
vendored
Binary file not shown.
BIN
vendor/cache/sinatra-1.4.6.gem
vendored
BIN
vendor/cache/sinatra-1.4.6.gem
vendored
Binary file not shown.
BIN
vendor/cache/vegas-0.1.11.gem
vendored
BIN
vendor/cache/vegas-0.1.11.gem
vendored
Binary file not shown.
Loading…
Reference in a new issue