dalli 0.9.9 → 0.9.10

data/History.md

@@ -1,6 +1,13 @@
 Dalli Changelog
 =====================
 
+0.9.10
+----
+
+ - Better server retry logic (next2you)
+ - Rails 3.1 compatibility (gucki)
+
+
 0.9.9
 ----
 
@@ -15,7 +22,7 @@ Dalli Changelog
       dc.set 'c', 3
       dc.delete 'd'
     end
- - Minor fix to set the continuum sorted by value.
+ - Minor fix to set the continuum sorted by value (kangster)
  - Implement session store with Rails 2.3.  Update docs.
 
 0.9.8

data/lib/action_dispatch/middleware/session/dalli_store.rb

@@ -46,8 +46,8 @@ module ActionDispatch
           [sid, session]
         end
 
-        def set_session(env, sid, session_data)
-          options = env['rack.session.options']
+        def set_session(env, sid, session_data, options = nil)
+          options ||= env[ENV_SESSION_OPTIONS_KEY]
           expiry  = options[:expire_after] || 0
           @pool.set(sid, session_data, expiry)
           sid

data/lib/dalli/client.rb

@@ -16,7 +16,7 @@ module Dalli
     #   :threadsafe - ensure that only one thread is actively using a socket at a time. Default: true.
     #
     def initialize(servers=nil, options={})
-      @servers = servers || 'localhost:11211'
+      @servers = servers || env_servers || 'localhost:11211'
       @options = options
     end
     
@@ -152,7 +152,7 @@ module Dalli
 
     def ring
       @ring ||= Dalli::Ring.new(
-        Array(env_servers || @servers).map do |s| 
+        Array(@servers).map do |s|
           Dalli::Server.new(s)
         end, @options
       )

data/lib/dalli/server.rb

@@ -36,7 +36,17 @@ module Dalli
     end
 
     def alive?
-      @sock && !@sock.closed?
+      return true if @sock && !@sock.closed?
+      return false if @down_at && @down_at == Time.now.to_i
+
+      begin
+        # try to reconnect at most once per second
+        connection
+        true
+      rescue Dalli::NetworkError => dne
+        Dalli.logger.info("Unable to connect to #{hostname}:#{port}: #{dne.message}")
+        down!
+      end
     end
 
     def close
@@ -295,7 +305,7 @@ module Dalli
         value = ''
         begin
           loop do
-            value << socket.sysread(count)
+            value << socket.sysread(count - value.size)
             break if value.size == count
           end
         rescue Errno::EAGAIN, Errno::EWOULDBLOCK

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '0.9.9'
+  VERSION = '0.9.10'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 9
-  version: 0.9.9
+  - 10
+  version: 0.9.10
 platform: ruby
 authors: 
 - Mike Perham
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 -07:00
+date: 2010-10-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency