Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Unreleased

- Fix retry logic not to attempt to retry on an open circuit breaker. Fix #227.

# 0.23.1

- Fix a potential crash in `hiredis-client` when using subcriptions (`next_event`). See #221.
Expand Down
7 changes: 6 additions & 1 deletion lib/redis_client.rb
Original file line number Diff line number Diff line change
Expand Up @@ -710,9 +710,14 @@ def ensure_connected(retryable: true)
end
rescue ConnectionError, ProtocolError => error
preferred_error ||= error
preferred_error = error unless error.is_a?(CircuitBreaker::OpenCircuitError)
close

if error.is_a?(CircuitBreaker::OpenCircuitError)
raise preferred_error
else
preferred_error = error
end

if !@disable_reconnection && config.retry_connecting?(tries, error)
tries += 1
retry
Expand Down
Loading