nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add resque timeout

Browse source
This commit is contained in:
Maxwell Salzberg 2011-09-08 10:46:36 -07:00
parent 0c00947fec
commit cd7640a971
3 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Gemfile
View file

@ -82,6 +82,7 @@ gem 'cloudfiles', '1.4.10', :require => false
#Queue #Queue
gem 'resque', '1.10.0' gem 'resque', '1.10.0'
gem 'resque-ensure-connected' gem 'resque-ensure-connected'
gem 'resque-timeout', '1.0.0'
gem 'SystemTimer', '1.2.1', :platforms => :ruby_18 gem 'SystemTimer', '1.2.1', :platforms => :ruby_18
group :development do group :development do

3
Gemfile.lock
View file

@ -374,6 +374,8 @@ GEM
resque-ensure-connected (0.1.0) resque-ensure-connected (0.1.0)
activerecord (>= 2.3.5) activerecord (>= 2.3.5)
resque (~> 1.10.0) resque (~> 1.10.0)
resque-timeout (1.0.0)
resque (~> 1.0)
rest-client (1.6.1) rest-client (1.6.1)
mime-types (>= 1.16) mime-types (>= 1.16)
rspec (2.6.0) rspec (2.6.0)
@ -521,6 +523,7 @@ DEPENDENCIES
redcarpet! redcarpet!
resque (= 1.10.0) resque (= 1.10.0)
resque-ensure-connected resque-ensure-connected
resque-timeout (= 1.0.0)
rest-client (= 1.6.1) rest-client (= 1.6.1)
roxml! roxml!
rspec (>= 2.0.0) rspec (>= 2.0.0)

1
config/initializers/resque.rb
View file

@ -1,5 +1,6 @@
require 'resque' require 'resque'
Resque::Plugins::Timeout.timeout = 120
if !ENV['SINGLE_PROCESS'] && AppConfig[:redis_url] if !ENV['SINGLE_PROCESS'] && AppConfig[:redis_url]
Resque.redis = Redis.new(:host => AppConfig[:redis_url], :port => 6379) Resque.redis = Redis.new(:host => AppConfig[:redis_url], :port => 6379)