dalli 1.0.4 → 1.0.5

data/History.md

@@ -1,6 +1,17 @@
 Dalli Changelog
 =====================
 
+1.1.0
+=======
+
+- Remove support for Rails 2.3, add support for Rails 3.1
+- Fix socket failure retry logic, now you can restart memcached and Dalli won't complain!
+
+1.0.5
+=======
+
+- Fix socket failure retry logic, now you can restart memcached and Dalli won't complain!
+
 1.0.4
 =======
 

data/lib/dalli/server.rb

@@ -98,7 +98,9 @@ module Dalli
       if @fail_count >= options[:socket_max_failures]
         down!
       else
+        close
         sleep(options[:socket_failure_delay]) if options[:socket_failure_delay]
+        raise Dalli::NetworkError, "Socket operation failed, retrying..."
       end
     end
     

data/lib/dalli/version.rb

@@ -1,3 +1,3 @@
 module Dalli
-  VERSION = '1.0.4'
+  VERSION = '1.0.5'
 end

data/test/test_failover.rb

@@ -2,19 +2,38 @@ require 'helper'
 
 class TestFailover < Test::Unit::TestCase
   context 'assuming some bad servers' do
+
+    should 'silently reconnect if server hiccups' do
+      memcached(29125) do
+        dc = Dalli::Client.new ['localhost:29125']
+        dc.set 'foo', 'bar'
+        foo = dc.get 'foo'
+        assert_equal foo, 'bar'
+
+        memcached_kill(29125)
+        memcached(29125) do
+
+          foo = dc.get 'foo'
+          assert_nil foo
+
+          memcached_kill(29125)
+        end
+      end
+    end
+
     should 'handle graceful failover' do
       memcached(29125) do
         memcached(29126) do
           dc = Dalli::Client.new ['localhost:29125', 'localhost:29126']
           dc.set 'foo', 'bar'
           foo = dc.get 'foo'
-          assert foo, 'bar'
+          assert_equal foo, 'bar'
           
           memcached_kill(29125)
 
           dc.set 'foo', 'bar'
           foo = dc.get 'foo'
-          assert foo, 'bar'
+          assert_equal foo, 'bar'
 
           memcached_kill(29126)
 

data/test/test_ring.rb

@@ -77,10 +77,6 @@ class TestRing < Test::Unit::TestCase
         assert_equal 1, dc.stats.values.compact.count
 
         memcached(29126) do
-          assert_equal 1, dc.stats.values.compact.count
-         
-          sleep(down_retry_delay+0.1)
-
           assert_equal 2, dc.stats.values.compact.count
         end
       end

metadata

@@ -2,7 +2,7 @@
 name: dalli
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors: 
 - Mike Perham
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 Z
+date: 2011-06-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
@@ -67,9 +67,7 @@ extra_rdoc_files: []
 files: 
 - lib/action_controller/session/dalli_store.rb
 - lib/action_dispatch/middleware/session/dalli_store.rb
-- lib/action_dispatch/middleware/session/dalli_store.rbc
 - lib/active_support/cache/dalli_store.rb
-- lib/active_support/cache/dalli_store.rbc
 - lib/active_support/cache/dalli_store23.rb
 - lib/dalli/client.rb
 - lib/dalli/compatibility.rb

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

@@ -1,1434 +0,0 @@
-!RBIX
-2959558172506603432
-x
-M
-1
-n
-n
-x
-10
-__script__
-i
-55
-5
-7
-0
-64
-47
-49
-1
-1
-15
-5
-7
-2
-64
-47
-49
-1
-1
-15
-5
-7
-3
-64
-47
-49
-1
-1
-15
-99
-7
-4
-65
-49
-5
-2
-13
-99
-12
-7
-6
-12
-7
-7
-12
-65
-12
-49
-8
-4
-15
-49
-6
-0
-15
-2
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-9
-s
-20
-active_support/cache
-x
-7
-require
-s
-49
-action_dispatch/middleware/session/abstract_store
-s
-5
-dalli
-x
-14
-ActionDispatch
-x
-11
-open_module
-x
-15
-__module_init__
-M
-1
-n
-n
-x
-14
-ActionDispatch
-i
-28
-5
-66
-99
-7
-0
-65
-49
-1
-2
-13
-99
-12
-7
-2
-12
-7
-3
-12
-65
-12
-49
-4
-4
-15
-49
-2
-0
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-5
-x
-7
-Session
-x
-11
-open_module
-x
-15
-__module_init__
-M
-1
-n
-n
-x
-7
-Session
-i
-31
-5
-66
-99
-7
-0
-45
-1
-2
-65
-49
-3
-3
-13
-99
-12
-7
-4
-12
-7
-5
-12
-65
-12
-49
-6
-4
-15
-49
-4
-0
-11
-I
-6
-I
-0
-I
-0
-I
-0
-n
-p
-7
-x
-10
-DalliStore
-x
-13
-AbstractStore
-n
-x
-10
-open_class
-x
-14
-__class_init__
-M
-1
-n
-n
-x
-10
-DalliStore
-i
-76
-5
-66
-99
-7
-0
-7
-1
-65
-67
-49
-2
-0
-49
-3
-4
-15
-99
-7
-4
-7
-5
-65
-67
-49
-2
-0
-49
-3
-4
-15
-5
-48
-6
-15
-99
-7
-7
-7
-8
-65
-67
-49
-2
-0
-49
-3
-4
-15
-99
-7
-9
-7
-10
-65
-67
-49
-2
-0
-49
-3
-4
-15
-99
-7
-11
-7
-12
-65
-67
-49
-2
-0
-49
-3
-4
-11
-I
-5
-I
-0
-I
-0
-I
-0
-n
-p
-13
-x
-10
-initialize
-M
-1
-n
-n
-x
-10
-initialize
-i
-159
-23
-1
-10
-14
-44
-43
-0
-78
-49
-1
-1
-19
-1
-15
-20
-1
-7
-2
-14
-2
-49
-3
-1
-13
-10
-43
-15
-20
-1
-7
-4
-49
-3
-1
-13
-18
-3
-49
-5
-2
-15
-8
-47
-18
-2
-16
-2
-15
-54
-89
-6
-15
-44
-43
-0
-80
-49
-1
-1
-13
-7
-7
-7
-8
-64
-49
-5
-2
-15
-13
-7
-9
-7
-10
-64
-49
-5
-2
-15
-39
-11
-49
-12
-1
-38
-11
-15
-20
-1
-7
-13
-49
-3
-1
-13
-10
-142
-15
-45
-14
-15
-43
-16
-13
-71
-17
-47
-9
-130
-47
-49
-18
-0
-13
-39
-11
-7
-9
-49
-3
-1
-39
-11
-47
-49
-6
-2
-15
-8
-142
-39
-11
-7
-9
-49
-3
-1
-39
-11
-49
-17
-2
-38
-19
-15
-39
-11
-7
-7
-49
-3
-1
-38
-20
-15
-54
-89
-6
-11
-I
-6
-I
-2
-I
-1
-I
-2
-n
-p
-21
-x
-4
-Hash
-x
-16
-new_from_literal
-x
-12
-expire_after
-x
-2
-[]
-x
-7
-expires
-x
-3
-[]=
-x
-10
-initialize
-x
-9
-namespace
-s
-12
-rack:session
-x
-15
-memcache_server
-s
-15
-localhost:11211
-x
-16
-@default_options
-x
-5
-merge
-x
-5
-cache
-x
-5
-Dalli
-n
-x
-6
-Client
-x
-3
-new
-x
-8
-allocate
-x
-5
-@pool
-x
-10
-@namespace
-p
-29
-I
--1
-I
-9
-I
-e
-I
-b
-I
-30
-I
-d
-I
-34
-I
-12
-I
-3c
-I
-10
-I
-46
-I
-11
-I
-4f
-I
-12
-I
-54
-I
-f
-I
-57
-I
-14
-I
-62
-I
-15
-I
-72
-I
-16
-I
-8e
-I
-14
-I
-91
-I
-18
-I
-9b
-I
-1a
-I
-9f
-x
-82
-/Users/mperham/src/git/dalli/lib/action_dispatch/middleware/session/dalli_store.rb
-p
-2
-x
-3
-app
-x
-7
-options
-x
-17
-method_visibility
-x
-15
-add_defn_method
-x
-5
-reset
-M
-1
-n
-n
-x
-5
-reset
-i
-6
-39
-0
-49
-1
-0
-11
-I
-1
-I
-0
-I
-0
-I
-0
-n
-p
-2
-x
-5
-@pool
-x
-5
-reset
-p
-5
-I
--1
-I
-1d
-I
-0
-I
-1e
-I
-6
-x
-82
-/Users/mperham/src/git/dalli/lib/action_dispatch/middleware/session/dalli_store.rb
-p
-0
-x
-7
-private
-x
-11
-get_session
-M
-1
-n
-n
-x
-11
-get_session
-i
-111
-20
-1
-13
-10
-11
-15
-5
-48
-0
-19
-1
-15
-26
-93
-0
-15
-29
-42
-0
-39
-1
-20
-1
-49
-2
-1
-13
-10
-37
-15
-44
-43
-3
-78
-49
-4
-1
-19
-2
-30
-8
-100
-26
-93
-1
-15
-24
-13
-45
-5
-6
-43
-7
-12
-49
-8
-1
-10
-61
-8
-95
-15
-45
-9
-10
-49
-11
-0
-7
-12
-24
-49
-13
-0
-47
-101
-14
-63
-2
-49
-15
-1
-15
-44
-43
-3
-78
-49
-4
-1
-19
-2
-25
-8
-100
-15
-92
-1
-27
-34
-92
-0
-27
-15
-20
-1
-20
-2
-35
-2
-11
-I
-8
-I
-3
-I
-2
-I
-2
-n
-p
-16
-x
-12
-generate_sid
-x
-5
-@pool
-x
-3
-get
-x
-4
-Hash
-x
-16
-new_from_literal
-x
-5
-Dalli
-n
-x
-10
-DalliError
-x
-3
-===
-x
-5
-Rails
-n
-x
-6
-logger
-s
-25
-Session::DalliStore#get: 
-x
-7
-message
-x
-4
-to_s
-x
-4
-warn
-p
-15
-I
--1
-I
-23
-I
-0
-I
-24
-I
-c
-I
-26
-I
-2f
-I
-27
-I
-3e
-I
-28
-I
-53
-I
-29
-I
-68
-I
-2b
-I
-6f
-x
-82
-/Users/mperham/src/git/dalli/lib/action_dispatch/middleware/session/dalli_store.rb
-p
-3
-x
-3
-env
-x
-3
-sid
-x
-7
-session
-x
-11
-set_session
-M
-1
-n
-n
-x
-11
-set_session
-i
-113
-23
-3
-10
-8
-1
-19
-3
-15
-26
-93
-0
-15
-29
-59
-0
-20
-3
-13
-10
-31
-15
-20
-0
-45
-0
-1
-49
-2
-1
-19
-3
-15
-20
-3
-7
-3
-49
-2
-1
-19
-4
-15
-39
-4
-20
-1
-20
-2
-20
-4
-49
-5
-3
-15
-20
-1
-30
-8
-109
-26
-93
-1
-15
-24
-13
-45
-6
-7
-43
-8
-12
-49
-9
-1
-10
-78
-8
-104
-15
-45
-10
-11
-49
-12
-0
-7
-13
-24
-49
-14
-0
-47
-101
-15
-63
-2
-49
-16
-1
-15
-3
-25
-8
-109
-15
-92
-1
-27
-34
-92
-0
-27
-11
-I
-b
-I
-5
-I
-3
-I
-4
-n
-p
-17
-x
-23
-ENV_SESSION_OPTIONS_KEY
-n
-x
-2
-[]
-x
-12
-expire_after
-x
-5
-@pool
-x
-3
-set
-x
-5
-Dalli
-n
-x
-10
-DalliError
-x
-3
-===
-x
-5
-Rails
-n
-x
-6
-logger
-s
-25
-Session::DalliStore#set: 
-x
-7
-message
-x
-4
-to_s
-x
-4
-warn
-p
-17
-I
--1
-I
-2e
-I
-8
-I
-2f
-I
-20
-I
-30
-I
-2a
-I
-31
-I
-36
-I
-32
-I
-40
-I
-33
-I
-4f
-I
-34
-I
-64
-I
-35
-I
-71
-x
-82
-/Users/mperham/src/git/dalli/lib/action_dispatch/middleware/session/dalli_store.rb
-p
-5
-x
-3
-env
-x
-3
-sid
-x
-12
-session_data
-x
-7
-options
-x
-6
-expiry
-x
-7
-destroy
-M
-1
-n
-n
-x
-7
-destroy
-i
-85
-26
-93
-0
-15
-29
-31
-0
-5
-20
-0
-47
-49
-0
-1
-19
-1
-9
-27
-39
-1
-20
-1
-49
-2
-1
-8
-28
-1
-30
-8
-81
-26
-93
-1
-15
-24
-13
-45
-3
-4
-43
-5
-12
-49
-6
-1
-10
-50
-8
-76
-15
-45
-7
-8
-49
-9
-0
-7
-10
-24
-49
-11
-0
-47
-101
-12
-63
-2
-49
-13
-1
-15
-3
-25
-8
-81
-15
-92
-1
-27
-34
-92
-0
-27
-11
-I
-7
-I
-2
-I
-1
-I
-1
-n
-p
-14
-x
-18
-current_session_id
-x
-5
-@pool
-x
-6
-delete
-x
-5
-Dalli
-n
-x
-10
-DalliError
-x
-3
-===
-x
-5
-Rails
-n
-x
-6
-logger
-s
-28
-Session::DalliStore#delete: 
-x
-7
-message
-x
-4
-to_s
-x
-4
-warn
-p
-15
-I
--1
-I
-38
-I
-0
-I
-39
-I
-12
-I
-3a
-I
-1b
-I
-39
-I
-24
-I
-3c
-I
-33
-I
-3d
-I
-48
-I
-3e
-I
-55
-x
-82
-/Users/mperham/src/git/dalli/lib/action_dispatch/middleware/session/dalli_store.rb
-p
-2
-x
-3
-env
-x
-3
-sid
-p
-13
-I
-2
-I
-9
-I
-10
-I
-1d
-I
-1e
-I
-21
-I
-22
-I
-23
-I
-30
-I
-2e
-I
-3e
-I
-38
-I
-4c
-x
-82
-/Users/mperham/src/git/dalli/lib/action_dispatch/middleware/session/dalli_store.rb
-p
-0
-x
-13
-attach_method
-p
-3
-I
-2
-I
-8
-I
-1f
-x
-82
-/Users/mperham/src/git/dalli/lib/action_dispatch/middleware/session/dalli_store.rb
-p
-0
-x
-13
-attach_method
-p
-3
-I
-2
-I
-7
-I
-1c
-x
-82
-/Users/mperham/src/git/dalli/lib/action_dispatch/middleware/session/dalli_store.rb
-p
-0
-x
-13
-attach_method
-p
-9
-I
-0
-I
-1
-I
-9
-I
-2
-I
-12
-I
-3
-I
-1b
-I
-6
-I
-37
-x
-82
-/Users/mperham/src/git/dalli/lib/action_dispatch/middleware/session/dalli_store.rb
-p
-0