Skip to content

Commit

Permalink
Revert "Raise error if we try to reconfig redis after it's been estab…
Browse files Browse the repository at this point in the history
…lished, fixes sidekiq#1309"

This reverts commit eb438ae.
  • Loading branch information
mperham committed Dec 7, 2013
1 parent 4c15aca commit 68fc326
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
7 changes: 0 additions & 7 deletions Changes.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
HEAD
-----------

- Raise error if application tries to configure Redis after the pool has been
established. Sidekiq's redis connection cannot be dynamically changed
at runtime. [#1309]

2.17.0
-----------

Expand Down
1 change: 0 additions & 1 deletion lib/sidekiq.rb
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ def self.redis(&block)
end

def self.redis=(hash)
raise "Sidekiq's redis pool has already been established, cannot configure" if @redis && !$TESTING
return @redis = hash if hash.is_a?(ConnectionPool)

if hash.is_a?(Hash)
Expand Down

0 comments on commit 68fc326

Please sign in to comment.