beetle 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa1aeb6c9cc3af6c5918a5b329e5203ed11cf5af
-  data.tar.gz: 1355e82b1f4f96ccc27efb8c600805b3e8d51a74
+  metadata.gz: 1506f684cf433c4d71f7ad9019de4fe82167e2f8
+  data.tar.gz: d09515d78afb673636622a21128b41fbdc3dc19b
 SHA512:
-  metadata.gz: 88f407ac509eaa3b28f8f8e81735ee4de0ff3a531552001cfb75e9a1a67f3d9c25ec325cd6d08709151cc634b1189c60220e8df7a816207c49888e1efd76266f
-  data.tar.gz: 8d688ac133f73f3d48ec4b7cdf75023d94a92c61f3491dfa9346555b3da5a5e731277dee7c2bd73534e59f0efd20fe27d302ff895729ff32adffeb973cbb5a0f
+  metadata.gz: f8f92c92c3de8485554ef577c97df0991493e145a6db5ceef11c55ada11166909e4cceb640119ed5f69ee49e40ffe5f260a12aca0efd02bd926c4c8bf7cdaf71
+  data.tar.gz: cd65e07319e8a84848d2f2ac32e5ef73585573f473bd7798f08ec18919ada22f34feacc5a53fcfeb7f7ef088281b2360da700905ee56d64d5a7f26bb18de4b29

data/lib/beetle/commands/garbage_collect_deduplication_store.rb

@@ -20,12 +20,13 @@ module Beetle
         opts.banner = "Usage: beetle garbage_collect_deduplication_store [options]"
         opts.separator ""
 
-        opts.on("--redis-servers LIST", Array, "Required (e.g. 192.168.0.1:6379,192.168.0.2:6379)") do |val|
-          Beetle.config.redis_servers = val.join(",")
-        end
-
         opts.on("--config-file PATH", String, "Path to an external yaml config file") do |val|
           Beetle.config.config_file = val
+          Beetle.config.log_file = STDOUT
+        end
+
+        opts.on("--redis-servers LIST", Array, "Comma separted list of redis server:port specs used for GC") do |val|
+          Beetle.config.redis_servers = val.join(",")
         end
 
         opts.on("--redis-db N", Integer, "Redis database used for GC") do |val|
@@ -33,6 +34,7 @@ module Beetle
         end
 
         opts.on("-v", "--verbose") do |val|
+          Beetle.config.log_file = STDOUT
           Beetle.config.logger.level = Logger::DEBUG
         end
 

data/lib/beetle/configuration.rb

@@ -8,7 +8,7 @@ module Beetle
     attr_accessor :logger
     # defaults to <tt>STDOUT</tt>
     attr_accessor :log_file
-    # number of seconds after which keys are removed form the message deduplication store (defaults to <tt>3.days</tt>)
+    # number of seconds after which keys are removed from the message deduplication store (defaults to <tt>1.hour</tt>)
     attr_accessor :gc_threshold
     # the redis server to use for deduplication
     # either a string like <tt>"localhost:6379"</tt> (default) or a file that contains the string.

data/lib/beetle/deduplication_store.rb

@@ -74,7 +74,7 @@ module Beetle
     # garbage collect keys in Redis (always assume the worst!)
     def garbage_collect_keys(now = Time.now.to_i)
       keys = redis.keys("msgid:*:expires")
-      threshold = now + @config.gc_threshold
+      threshold = now - @config.gc_threshold
       keys.each do |key|
         gc_key(key, threshold)
       end
@@ -82,7 +82,7 @@ module Beetle
 
     # garbage collect keys from a given file
     def garbage_collect_keys_from_file(file_name, now = Time.now.to_i)
-      threshold = now + @config.gc_threshold
+      threshold = now - @config.gc_threshold
       expired = total = 0
       File.foreach(file_name) do |line|
         line.chomp!
@@ -104,7 +104,7 @@ module Beetle
           redis.del(*keys(msg_id))
           return true
         else
-          # keys has future expiry date
+          # key has future expiry date
           # puts "#{msg_id} expires on #{Time.at(expires_at.to_i)}"
           return false
         end

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "0.3.4"
+  VERSION = "0.3.5"
 end

data/test/beetle/deduplication_store_test.rb

@@ -114,11 +114,13 @@ module Beetle
   class GarbageCollectionTest < Test::Unit::TestCase
     def setup
       @store = DeduplicationStore.new
+      Beetle.config.stubs(:gc_threshold).returns(10)
     end
 
-    test "never tries to delete message keys when expire key doesn not exist" do
+    test "never tries to delete message keys when expire key does not exist" do
       key = "foo"
       @store.redis.del key
+      @store.redis.expects(:del).never
       assert !@store.gc_key(key, 0)
     end
 
@@ -132,5 +134,29 @@ module Beetle
       @store.logger.expects(:error)
       @store.garbage_collect_keys_using_master_and_slave
     end
+
+    test "garbage collects a key when it has expired" do
+      key = "foo"
+      t = Time.now.to_i
+      @store.redis.set(key, t)
+      @store.redis.expects(:del)
+      assert @store.gc_key(key, t+1)
+    end
+
+    test "does not garbage collect a key when it has not expired" do
+      key = "foo"
+      t = Time.now.to_i
+      @store.redis.set(key, t)
+      @store.redis.expects(:del).never
+      assert !@store.gc_key(key, t)
+    end
+
+    test "correctly sets threshold for garbage collection" do
+      t = Time.now.to_i
+      @store.redis.expects(:keys).returns(["foo"])
+      @store.expects(:gc_key).with("foo", t-10)
+      @store.garbage_collect_keys
+    end
+
   end
 end

data/test/beetle/message_test.rb

@@ -84,33 +84,33 @@ module Beetle
     end
 
     test "should be able to garbage collect expired keys" do
-      Beetle.config.expects(:gc_threshold).returns(0)
+      Beetle.config.expects(:gc_threshold).returns(10)
       header = header_with_params({:ttl => 0})
       message = Message.new("somequeue", header, 'foo', :store => @store)
       assert !message.key_exists?
       assert message.key_exists?
       @store.redis.expects(:del).with(*@store.keys(message.msg_id))
-      @store.garbage_collect_keys(Time.now.to_i+1)
+      @store.garbage_collect_keys(Time.now.to_i+11)
     end
 
     test "should be able to garbage collect expired keys using master and slave" do
-      Beetle.config.expects(:gc_threshold).returns(0)
+      Beetle.config.expects(:gc_threshold).returns(10)
       header = header_with_params({:ttl => 0})
       message = Message.new("somequeue", header, 'foo', :store => @store)
       assert !message.key_exists?
       assert message.key_exists?
       @store.redis.expects(:del).with(*@store.keys(message.msg_id))
-      @store.garbage_collect_keys_using_master_and_slave(Time.now.to_i+1)
+      @store.garbage_collect_keys_using_master_and_slave(Time.now.to_i+11)
     end
 
     test "should not garbage collect not yet expired keys" do
-      Beetle.config.expects(:gc_threshold).returns(0)
+      Beetle.config.expects(:gc_threshold).returns(10)
       header = header_with_params({:ttl => 0})
       message = Message.new("somequeue", header, 'foo', :store => @store)
       assert !message.key_exists?
       assert message.key_exists?
       @store.redis.expects(:del).never
-      @store.garbage_collect_keys(Time.now.to_i-1)
+      @store.garbage_collect_keys(Time.now.to_i)
     end
 
     test "successful processing of a non redundant message should delete all keys from the database" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid4r