Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

minor cleanup

  • Loading branch information...
commit 82cad7f9d385599cad5aff62f03f82072589632a 1 parent 6f52e83
@tmm1 authored
Showing with 7 additions and 3 deletions.
  1. +3 −1 lib/dalli/client.rb
  2. +4 −2 lib/dalli/server.rb
View
4 lib/dalli/client.rb
@@ -80,7 +80,9 @@ def get_multi(*keys)
next unless server.alive?
begin
server.multi_response_start
- rescue NetworkError => e
+ rescue DalliError, NetworkError => e
+ Dalli.logger.debug { e.inspect }
+ Dalli.logger.debug { "results from this server will be missing" }
servers_in_use.delete(server)
end
end
View
6 lib/dalli/server.rb
@@ -113,6 +113,7 @@ def compressor
#
# Returns nothing.
def multi_response_start
+ verify_state
write_noop
@multi_buffer = ''
@inprogress = true
@@ -124,8 +125,9 @@ def multi_response_completed?
end
# Attempt to receive and parse as many key/value pairs as possible
- # from this server. This should be invoked repeatedly whenever this
- # server's socket is readable, until #multi_response_completed? is true.
+ # from this server. After #multi_response_start, this should be invoked
+ # repeatedly whenever this server's socket is readable until
+ # #multi_response_completed?.
#
# Returns a Hash of kv pairs received.
def multi_response_nonblock
Please sign in to comment.
Something went wrong with that request. Please try again.