diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-04 18:24:23 -0200 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-12-04 18:24:23 -0200 |
| commit | 191ea4b85b6878feedc1b18d0dcf56d2825895a1 (patch) | |
| tree | 8359c11302e26c60f805a47f97ad00653ebe6ba3 /activejob | |
| parent | 2673a359e1020390cc8ae0208e7795f61c9fba89 (diff) | |
| parent | 2fa4cbeebde4cbaf4fdddb1723960710c67f89a8 (diff) | |
| download | rails-191ea4b85b6878feedc1b18d0dcf56d2825895a1.tar.gz rails-191ea4b85b6878feedc1b18d0dcf56d2825895a1.tar.bz2 rails-191ea4b85b6878feedc1b18d0dcf56d2825895a1.zip | |
Merge pull request #17825 from aripollak/fix-activejob-sidekiq-integration
Fix Sidekiq ActiveJob integration setup
Conflicts:
activejob/test/support/integration/adapters/sidekiq.rb
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/test/support/integration/adapters/sidekiq.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb index bdc61a1462..6ff18fb56a 100644 --- a/activejob/test/support/integration/adapters/sidekiq.rb +++ b/activejob/test/support/integration/adapters/sidekiq.rb @@ -48,7 +48,8 @@ module SidekiqJobsManager def can_run? begin - Sidekiq.redis(&:connect) + Sidekiq.redis(&:info) + Sidekiq.logger = nil rescue return false end |