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

bump sidekiq

Browse source
This commit is contained in:
Jonne Haß 2013-04-25 21:30:05 +02:00
parent aab960d896
commit ea792246d0
5 changed files with 7 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -17,7 +17,7 @@ gem 'devise', '2.1.3'
# Background processing # Background processing
gem 'sidekiq', '2.10.1' gem 'sidekiq', '2.11.1'
gem 'sinatra', '1.3.3' gem 'sinatra', '1.3.3'
gem 'slim', '1.3.8' gem 'slim', '1.3.8'

12
Gemfile.lock
View file

@ -55,8 +55,7 @@ GEM
carrierwave (0.8.0) carrierwave (0.8.0)
activemodel (>= 3.2.0) activemodel (>= 3.2.0)
activesupport (>= 3.2.0) activesupport (>= 3.2.0)
celluloid (0.12.4) celluloid (0.13.0)
facter (>= 1.6.12)
timers (>= 1.0.0) timers (>= 1.0.0)
childprocess (0.3.9) childprocess (0.3.9)
ffi (~> 1.0, >= 1.0.11) ffi (~> 1.0, >= 1.0.11)
@ -100,7 +99,6 @@ GEM
excon (0.20.1) excon (0.20.1)
execjs (1.4.0) execjs (1.4.0)
multi_json (~> 1.0) multi_json (~> 1.0)
facter (1.7.0)
factory_girl (4.2.0) factory_girl (4.2.0)
activesupport (>= 3.0.0) activesupport (>= 3.0.0)
factory_girl_rails (4.2.1) factory_girl_rails (4.2.1)
@ -309,7 +307,7 @@ GEM
rdoc (3.12.2) rdoc (3.12.2)
json (~> 1.4) json (~> 1.4)
redcarpet (2.2.2) redcarpet (2.2.2)
redis (3.0.3) redis (3.0.4)
redis-namespace (1.2.1) redis-namespace (1.2.1)
redis (~> 3.0.0) redis (~> 3.0.0)
remotipart (1.0.5) remotipart (1.0.5)
@ -348,8 +346,8 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rubyzip rubyzip
websocket (~> 1.0.4) websocket (~> 1.0.4)
sidekiq (2.10.1) sidekiq (2.11.1)
celluloid (~> 0.12.0) celluloid (~> 0.13.0)
connection_pool (~> 1.0) connection_pool (~> 1.0)
multi_json (~> 1) multi_json (~> 1)
redis (~> 3) redis (~> 3)
@ -470,7 +468,7 @@ DEPENDENCIES
ruby-oembed (= 0.8.8) ruby-oembed (= 0.8.8)
sass-rails (= 3.2.6) sass-rails (= 3.2.6)
selenium-webdriver (= 2.32.1) selenium-webdriver (= 2.32.1)
sidekiq (= 2.10.1) sidekiq (= 2.11.1)
sinatra (= 1.3.3) sinatra (= 1.3.3)
slim (= 1.3.8) slim (= 1.3.8)
spork (= 1.0.0rc3) spork (= 1.0.0rc3)

3
app/workers/base.rb
View file

@ -5,8 +5,7 @@
module Workers module Workers
class Base class Base
include Sidekiq::Worker include Sidekiq::Worker
sidekiq_options timeout: AppConfig.environment.sidekiq.timeout.to_i, sidekiq_options backtrace: ((bt = AppConfig.environment.sidekiq.backtrace.get) && bt.to_i),
backtrace: ((bt = AppConfig.environment.sidekiq.backtrace.get) && bt.to_i),
retry: AppConfig.environment.sidekiq.retry.to_i retry: AppConfig.environment.sidekiq.retry.to_i
# In the long term we need to eliminate the cause of these # In the long term we need to eliminate the cause of these

1
config/defaults.yml
View file

@ -16,7 +16,6 @@ defaults:
namespace: "diaspora" namespace: "diaspora"
concurrency: 5 concurrency: 5
retry: 10 retry: 10
timeout: 900
backtrace: 15 backtrace: 15
log: "log/sidekiq.log" log: "log/sidekiq.log"
s3: s3:

3
config/diaspora.yml.example
View file

@ -84,9 +84,6 @@ configuration: ## Section
## Set this to false to disable it completely ## Set this to false to disable it completely
#retry: 10 #retry: 10
## Time in seconds before a job is killed
#timeout: 900
## Namespace to use in Redis, useful if you need to run ## Namespace to use in Redis, useful if you need to run
## multiple instances of Diaspora using the same Redis instance ## multiple instances of Diaspora using the same Redis instance
#namespace: "diaspora" #namespace: "diaspora"