mirror of
https://github.com/mperham/sidekiq.git
synced 2022-11-09 13:52:34 -05:00
Update supported Ruby and Rails versions, fixes #3318
This commit is contained in:
parent
dc6204d76c
commit
74a4c50e60
4 changed files with 7 additions and 9 deletions
|
@ -7,13 +7,12 @@ better with the new Rails 5.0 Executor.
|
|||
|
||||
* Integrate the job logging and retry logic directly in with the job
|
||||
execution logic in Sidekiq::Processor. Previously this logic was
|
||||
defined as middleware. Rails's Executor handles ActiveRecord
|
||||
defined as middleware. In Rails 5.0, ActiveSupport::Executor handles ActiveRecord
|
||||
connection management, job callbacks, development mode class loading,
|
||||
etc. Because of its extensive responsibilities, the Executor can't be
|
||||
integrated as Sidekiq middleware; the logging/retry logic had to be pulled out
|
||||
too. Sidekiq 4.2 had a hack to make it work but this redesign provides
|
||||
a cleaner integration. [#3235]
|
||||
|
||||
* The Delayed Extensions `delay`, `delay_in` and `delay_until` APIs are
|
||||
no longer available by default. The extensions allow you to marshal
|
||||
job arguments as YAML, leading to cases where job payloads could be many
|
||||
|
@ -26,11 +25,12 @@ better with the new Rails 5.0 Executor.
|
|||
Sidekiq::Extensions.enable_delay!
|
||||
```
|
||||
The old `Sidekiq.remove_delay!` API has been removed as it is now the default. [#3299]
|
||||
|
||||
* Sidekiq's quiet signal is now `TSTP` (think of it as **T**hread
|
||||
**ST**o**P**) instead of USR1 as USR1 is not available on JRuby.
|
||||
USR1 will continue to be supported in Sidekiq 5.x for backwards
|
||||
compatibility and will be removed in Sidekiq 6.x. [#3302]
|
||||
* Rails 3.2 is no longer supported.
|
||||
* Ruby 2.0 and Ruby 2.1 are no longer supported. Ruby 2.2.2+ is required.
|
||||
|
||||
## Upgrade
|
||||
|
||||
|
|
|
@ -32,9 +32,9 @@ DelayedJob 4.1.1 | - | - | 465 sec | 215 jobs/sec
|
|||
Requirements
|
||||
-----------------
|
||||
|
||||
Sidekiq supports CRuby 2.0+ and JRuby 9k.
|
||||
Sidekiq supports CRuby 2.2.2+ and JRuby 9k.
|
||||
|
||||
All Rails releases >= 3.2 are officially supported.
|
||||
All Rails releases >= 4.0 are officially supported.
|
||||
|
||||
Redis 2.8 or greater is required. 3.0.3+ is recommended for large
|
||||
installations with thousands of worker threads.
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
# encoding: utf-8
|
||||
# frozen_string_literal: true
|
||||
require 'sidekiq/version'
|
||||
fail "Sidekiq #{Sidekiq::VERSION} does not support Ruby versions below 2.0.0." if RUBY_PLATFORM != 'java' && RUBY_VERSION < '2.0.0'
|
||||
fail "Sidekiq #{Sidekiq::VERSION} does not support Ruby versions below 2.2.2." if RUBY_PLATFORM != 'java' && RUBY_VERSION < '2.2.2'
|
||||
|
||||
require 'sidekiq/logging'
|
||||
require 'sidekiq/client'
|
||||
|
|
|
@ -240,9 +240,7 @@ module Sidekiq
|
|||
if File.directory?(options[:require])
|
||||
require 'rails'
|
||||
if ::Rails::VERSION::MAJOR < 4
|
||||
require 'sidekiq/rails'
|
||||
require File.expand_path("#{options[:require]}/config/environment.rb")
|
||||
::Rails.application.eager_load!
|
||||
raise "Sidekiq no longer supports this version of Rails"
|
||||
elsif ::Rails::VERSION::MAJOR == 4
|
||||
# Painful contortions, see 1791 for discussion
|
||||
# No autoloading, we want to force eager load for everything.
|
||||
|
|
Loading…
Reference in a new issue