rotary 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d91a035b7bc8d12853f4f372312d47a79ee2008f
-  data.tar.gz: 0816ed9b7d5e25759a9d672296db5647e5baa528
+  metadata.gz: 937de9bd091e3c310811ba5ca77d566f8197fce6
+  data.tar.gz: 0bb6b8a64a102bdf777c1c1f345e1f46e6c301d7
 SHA512:
-  metadata.gz: 963995e2f76b2cd92547b565427b055b950bf9932ee9c332b7a34cb4207af22888171527cdc8dc9c26bf6a0ae03ad0dea927572c0c0edcb203f36709de77c963
-  data.tar.gz: 548523678285d0d620d83d51145c2bd09b31a3aec99c0c4fd21ed1c78f67b040cd0745c98d63d9e478b308ac362649d7a68695e6a9ff125392698753771afeff
+  metadata.gz: 94c47830c8ae7f204384457b6f8109a334a54738fab172f8d8cc7d33c8c0e0bf51bfd37a89d58bbfdd4ce37e3a17579a8dc126828820767577cdd1beb9ff80aa
+  data.tar.gz: fd5cf5e64b15afcbdf42389db23a399762002216d966ece09ee9e54eff3dd457677199f0a47b9af7ffed69a0393671959da81b91b3466bb9e241c4930dfe0475

data/lib/rotary/storage/redis.rb

@@ -60,12 +60,10 @@ module Rotary
 
       # Removes sessions, where ttl is bigger than threshold n.
       def clean_older_than(n)
-        len = @redis.llen(@pool_list)
-
         # It doesn't have to happen atomically.
         # New session will be lpush'ed, we can easily check only
         # N sessions from the right.
-        len.times do
+        size.times do
           serialized_session = @redis.rpop(@pool_list)
 
           # We have no sessions left. It can happen.
@@ -74,11 +72,13 @@ module Rotary
           key = ttl_key(serialized_session)
           ttl_marker = @redis.ttl(key)
 
-          # redis.rb returns -2 when key doesn't exist
-          no_ttl = ttl_marker == -2
-          next if no_ttl
+          # When key doesn't exist
+          #   redis <= 2.6 returns -1
+          #   redis >= 2.8 returns -2
+          no_key = [-1, -2].include?(ttl_marker)
+          next if no_key
 
-          old = ttl_marker < (@ttl - n)
+          old = @ttl ? ttl_marker < (@ttl - n) : false
           if old
             # delete ttl key
             @redis.del(key)
@@ -87,7 +87,7 @@ module Rotary
             yield(session) if block_given?
           else
             # push back from the left side
-            @redis.lpush(@pool_list, session)
+            @redis.lpush(@pool_list, serialized_session)
           end
         end
       end

data/lib/rotary/version.rb

@@ -1,4 +1,4 @@
 module Rotary
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rotary
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Denis Redozubov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake