diff options
author | Jonne Haß <me@mrzyx.de> | 2013-02-19 12:34:41 +0400 |
---|---|---|
committer | Jonne Haß <me@mrzyx.de> | 2013-03-22 02:39:07 +0400 |
commit | 79a79d65d684b6cfa93e1d2dde9ac7abcfb7a481 (patch) | |
tree | 669d78aa2e901133bf58ec26c98c3e705f13bff3 /config/defaults.yml | |
parent | 3fc3b249e71f05a664a81d47d35f9b2815de5e97 (diff) |
Bye Resque. Ohai Sidekiq.
* Dropped all references to Resque
* Moved all jobs under app/workers since that's the Sidekiq convention
* Renamed Jobs module to Worker to match new location
* Adapted all jobs to Sidekiq
* Replaced all enqueue calls with perform_async
* Dropped Resque hacks from specs and features, replaced with
sidekig/testing in RSpec and sidekig/testing/inline in Cucumber
* Updated scripts to start a Sidekiq server
* Inline Sidekiq sinatra app
* Let Sidekiq create the actual Redis instance
* Workaround already initialized constant warnings in service models
* Resolved ToDo in one job definition by creating proper exception clases
for some errors in receiving posts
* Added sidekiq section to configuration to make it completly
configurable to the user
* Add Sidekiq middleware for clean backtraces
* Delay HttpMulti retry to give offline pods a chance to come back up
* Do not retry on GUID already taken and alike errors
* Be graceful about deleted posts in GatherOEmbedData
Diffstat (limited to 'config/defaults.yml')
-rw-r--r-- | config/defaults.yml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/config/defaults.yml b/config/defaults.yml index 19525e6fd..e1dad5b27 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -12,6 +12,13 @@ defaults: redis: require_ssl: true single_process_mode: false + sidekiq: + namespace: "diaspora" + concurrency: 5 + retry: 10 + timeout: 900 + backtrace: 15 + log: "log/sidekiq.log" s3: enable: false key: @@ -32,8 +39,7 @@ defaults: stdout_log: database: 'mysql' unicorn_worker: 2 - embed_resque_worker: false - resque_workers: 1 + embed_sidekiq_worker: false privacy: jquery_cdn: true google_analytics_key: @@ -88,7 +94,6 @@ defaults: admins: account: podmin_email: - inline_resque_web: true development: environment: @@ -123,12 +128,14 @@ test: integration1: environment: url: "http://localhost:45789/" + single_process_mode: true assets: serve: true require_ssl: false integration2: environment: url: "http://localhost:34658/" + single_process_mode: true assets: serve: true require_ssl: false |