mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #17825 from aripollak/fix-activejob-sidekiq-integration
Fix Sidekiq ActiveJob integration setup Conflicts: activejob/test/support/integration/adapters/sidekiq.rb
This commit is contained in:
commit
191ea4b85b
1 changed files with 2 additions and 1 deletions
|
@ -48,7 +48,8 @@ module SidekiqJobsManager
|
|||
|
||||
def can_run?
|
||||
begin
|
||||
Sidekiq.redis(&:connect)
|
||||
Sidekiq.redis(&:info)
|
||||
Sidekiq.logger = nil
|
||||
rescue
|
||||
return false
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue