beetle 3.3.9 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95e3ab98a559390c7f20bb68ae99e8636c82df9a66fff22413c73459d9ff6332
-  data.tar.gz: dd0e5868943f6b2cdb9d73037851da75b380171487a0f5cb29328a8e44aaec40
+  metadata.gz: 8d614608acda319dc8b0a440211ccd4b741e5efec93c58400c08113a55ca5669
+  data.tar.gz: fbc0231476fb3139348de5704e0dc8d936a53b6eff52e2045086a464559199c6
 SHA512:
-  metadata.gz: cbec6f5dcf9bdd429442cea86190bed2960038d31241781b5a748586a76038e060654bd91c0f559b3f17ee57e41b97017859549c3c11523df76ccfddde3d022b
-  data.tar.gz: '091e597c4b84ec2bf72d14ae1875ee6e44d39770b82968c803cc4029c26d252aa24eb53f88c4893ef0f98acb496ea2c691a5bcb4f829ac1ae174228e705da852'
+  metadata.gz: 16406822a821a4b09e056b510bde4b964fb8169b211a7fb1b2af1e3ceefda9329ee0939516c92a76a3b18b4eb2c6d6e32a7387f4114d5f3b7ea6c1418446e6e6
+  data.tar.gz: b7520fc46f506d597f718d079c95c0842064aed09e2472cd36bf481dce5f8c53c014a82f09ba90cf9971fc83af858b90bc1d952284533dabfbe5df9db3ecc2bf

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,23 @@
 = Release Notes
 
+== Version 3.4.1
+* Update amq-protocol gem to version 2.3.1.
+
+== Version 3.4.0
+* Require redis gem version 4.2.1. This version changes the exists to check for the
+  existence of multiple keys, return the number of keys in the list that exist. This
+  requires at least redis gem version 4.2.0, but 4.2.1 contains a bug fix for said
+  command.
+
+== Version 3.3.12
+* Support queue level declaration of dead letter queue message TTL.
+
+== Version 3.3.11
+* Fixed that dead lettering only works correctly with global config option.
+
+== Version 3.3.10
+* Support configuring RabbitMQ write timeout.
+
 == Version 3.3.9
 * Reduce the number of queue policies created on the servers by allowing
   the spefication of a default broker policy. You need to install the

data/beetle.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |s|
 
   s.specification_version = 3
   s.add_runtime_dependency "bunny",                   "~> 0.7.12"
-  s.add_runtime_dependency "redis",                   ">= 2.2.2"
+  s.add_runtime_dependency "redis",                   ">= 4.2.1"
   s.add_runtime_dependency "hiredis",                 ">= 0.4.5"
-  s.add_runtime_dependency "amq-protocol",            "= 2.3.0"
+  s.add_runtime_dependency "amq-protocol",            "= 2.3.1"
   s.add_runtime_dependency "amqp",                    "= 1.8.0"
   s.add_runtime_dependency "activesupport",           ">= 2.3.4"
 

data/lib/beetle/base.rb

@@ -78,7 +78,8 @@ module Beetle
     end
 
     def bind_dead_letter_queue!(channel, target_queue, creation_keys = {})
-      policy_options = @client.queues[target_queue].slice(:dead_lettering, :lazy)
+      policy_options = @client.queues[target_queue].slice(:dead_lettering, :lazy, :dead_lettering_msg_ttl)
+      policy_options[:message_ttl] = policy_options.delete(:dead_lettering_msg_ttl)
       dead_letter_queue_name = "#{target_queue}_dead_letter"
       if policy_options[:dead_lettering]
         logger.debug("Beetle: creating dead letter queue #{dead_letter_queue_name} with opts: #{creation_keys.inspect}")
@@ -88,7 +89,7 @@ module Beetle
         :queue_name => target_queue,
         :bindings => @client.bindings[target_queue],
         :dead_letter_queue_name => dead_letter_queue_name,
-        :message_ttl => @client.config.dead_lettering_msg_ttl,
+        :message_ttl => policy_options[:message_ttl]
       }.merge(policy_options)
     end
 

data/lib/beetle/client.rb

@@ -96,7 +96,8 @@ module Beetle
       raise ConfigurationError.new("queue #{name} already configured") if queues.include?(name)
       opts = {
         :exchange => name, :key => name, :auto_delete => false, :amqp_name => name,
-        :lazy => config.lazy_queues_enabled, :dead_lettering => config.dead_lettering_enabled
+        :lazy => config.lazy_queues_enabled, :dead_lettering => config.dead_lettering_enabled,
+        :dead_lettering_msg_ttl => config.dead_lettering_msg_ttl
       }.merge!(options.symbolize_keys)
       opts.merge! :durable => true, :passive => false, :exclusive => false
       exchange = opts.delete(:exchange).to_s

data/lib/beetle/configuration.rb

@@ -107,8 +107,10 @@ module Beetle
     # Whether to update quueue policies synchronously or asynchronously.
     attr_accessor :update_queue_properties_synchronously
 
-    # Read timeout for http requests to create dead letter bindings
+    # Read timeout for http requests to RabbitMQ HTTP API
     attr_accessor :rabbitmq_api_read_timeout
+    # Write timeout for http requests to RabbitMQ HTTP API
+    attr_accessor :rabbitmq_api_write_timeout
 
     # Returns the port on which the Rabbit API is hosted
     attr_accessor :api_port
@@ -178,6 +180,7 @@ module Beetle
       self.dead_lettering_enabled = false
       self.dead_lettering_msg_ttl = 1000   # 1 second
       self.rabbitmq_api_read_timeout = 60  # 60 seconds
+      self.rabbitmq_api_write_timeout = 60  # 60 seconds
 
       self.lazy_queues_enabled = false
       self.throttling_refresh_interval = 60 # seconds

data/lib/beetle/deduplication_store.rb

@@ -120,7 +120,7 @@ module Beetle
 
     # check whether key with given suffix exists for a given <tt>msg_id</tt>.
     def exists(msg_id, suffix)
-      with_failover { redis.exists(key(msg_id, suffix)) }
+      with_failover { redis.exists?(key(msg_id, suffix)) }
     end
 
     # flush the configured redis database. useful for testing.

data/lib/beetle/queue_properties.rb

@@ -164,6 +164,7 @@ module Beetle
       end
       http = Net::HTTP.new(uri.hostname, config.api_port)
       http.read_timeout = config.rabbitmq_api_read_timeout
+      http.write_timeout = config.rabbitmq_api_write_timeout if http.respond_to?(:write_timeout=)
       # don't do this in production:
       # http.set_debug_output(logger.instance_eval{ @logdev.dev })
       http.start do |instance|

data/lib/beetle/subscriber.rb

@@ -180,7 +180,7 @@ module Beetle
           processor = Handler.create(handler, opts)
           result = m.process(processor)
           if result.reject?
-            if @client.config.dead_lettering_enabled?
+            if @client.queues[queue_name][:dead_lettering]
               header.reject(:requeue => false)
             else
               sleep 1

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "3.3.9"
+  VERSION = "3.4.1"
 end

data/test/beetle/client_test.rb

@@ -79,7 +79,7 @@ module Beetle
 
     test "registering a queue should store it in the configuration with symbolized option keys and force durable=true and passive=false and set the amqp queue name" do
       @client.register_queue("some_queue", "durable" => false, "exchange" => "some_exchange")
-      assert_equal({:durable => true, :passive => false, :lazy=>false, :dead_lettering=>false, :auto_delete => false, :exclusive => false, :amqp_name => "some_queue"}, @client.queues["some_queue"])
+      assert_equal({:durable => true, :passive => false, :lazy=>false, :dead_lettering=>false, :dead_lettering_msg_ttl=>1000, :auto_delete => false, :exclusive => false, :amqp_name => "some_queue"}, @client.queues["some_queue"])
     end
 
     test "registering a queue should add the queue to the list of queues of the queue's exchange" do

data/test/beetle/deduplication_store_test.rb

@@ -9,7 +9,7 @@ module Beetle
     end
 
     test "trying to delete a non existent key doesn't throw an error" do
-      assert !@r.exists("hahahaha")
+      assert !@r.exists?("hahahaha")
       assert_equal 0, @r.del("hahahaha")
     end
 

data/test/beetle/message_test.rb

@@ -141,9 +141,7 @@ module Beetle
 
       message.process(@null_handler)
       keys = @store.keys(message.msg_id)
-      keys.each do |key|
-        assert !@store.redis.exists(key)
-      end
+      assert_equal 0, @store.redis.exists(*keys)
     end
 
     test "successful processing of a non redundant message should delete all keys from the database (except the status key, which should be set to expire)" do
@@ -159,11 +157,9 @@ module Beetle
       message.process(@null_handler)
       keys = @store.keys(message.msg_id)
       status_key = keys.shift
-      assert @store.redis.exists(status_key)
+      assert @store.redis.exists?(status_key)
       assert @store.redis.ttl(status_key) <= @config.redis_status_key_expiry_interval
-      keys.each do |key|
-        assert !@store.redis.exists(key)
-      end
+      assert_equal 0, @store.redis.exists(*keys)
     end
 
     test "successful processing of a redundant message twice should delete all keys from the database" do
@@ -179,9 +175,7 @@ module Beetle
       message.process(@null_handler)
 
       keys = @store.keys(message.msg_id)
-      keys.each do |key|
-        assert !@store.redis.exists(key)
-      end
+      assert_equal 0, @store.redis.exists(*keys)
     end
 
     test "successful processing of a redundant message twice should delete all keys from the database (except the status key, which should be set to expire)" do
@@ -199,11 +193,9 @@ module Beetle
 
       keys = @store.keys(message.msg_id)
       status_key = keys.shift
-      assert @store.redis.exists(status_key)
+      assert @store.redis.exists?(status_key)
       assert @store.redis.ttl(status_key) <= @config.redis_status_key_expiry_interval
-      keys.each do |key|
-        assert !@store.redis.exists(key)
-      end
+      assert_equal 0, @store.redis.exists(*keys)
     end
 
     test "successful processing of a redundant message once should insert all but the delay key and the exception count key into the database" do

data/test/beetle/subscriber_test.rb

@@ -224,13 +224,11 @@ module Beetle
     end
   end
 
-
   class DeadLetteringCallBackExecutionTest < Minitest::Test
     def setup
       @client = Client.new
-      @client.config.dead_lettering_enabled = true
       @queue = "somequeue"
-      @client.register_queue(@queue)
+      @client.register_queue(@queue, :dead_lettering => true)
       @sub = @client.send(:subscriber)
       mq = mock("MQ")
       mq.expects(:closing?).returns(false)
@@ -239,11 +237,7 @@ module Beetle
       @handler = Handler.create(lambda{|*args| raise @exception})
       # handler method 'processing_completed' should be called under all circumstances
       @handler.expects(:processing_completed).once
-      @callback = @sub.send(:create_subscription_callback, "my myessage", @queue, @handler, :exceptions => 1)
-    end
-
-    def teardown
-      @client.config.dead_lettering_enabled = false
+      @callback = @sub.send(:create_subscription_callback, @queue, @queue, @handler, :exceptions => 1)
     end
 
     test "should call reject on the message header when processing the handler returns true on reject? if dead lettering has been enabled" do
@@ -255,19 +249,18 @@ module Beetle
       header.expects(:reject).with(:requeue => false)
       @callback.call(header, 'foo')
     end
-
   end
 
   class CallBackExecutionTest < Minitest::Test
     def setup
-      client = Client.new
+      @client = Client.new
       @queue = "somequeue"
-      client.register_queue(@queue)
-      @sub = client.send(:subscriber)
+      @client.register_queue(@queue)
+      @sub = @client.send(:subscriber)
       @exception = Exception.new "murks"
       @handler = Handler.create(lambda{|*args| raise @exception})
       @handler.instance_eval { def post_process; raise "shoot"; end }
-      @callback = @sub.send(:create_subscription_callback, "my myessage", @queue, @handler, :exceptions => 1)
+      @callback = @sub.send(:create_subscription_callback, @queue, @queue, @handler, :exceptions => 1)
     end
 
     test "exceptions raised from message processing should be ignored" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 3.3.9
+  version: 3.4.1
 platform: ruby
 authors:
 - Stefan Kaes
@@ -9,10 +9,10 @@ authors:
 - Ali Jelveh
 - Sebastian Roebke
 - Larry Baltz
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -34,14 +34,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 4.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: hiredis
   requirement: !ruby/object:Gem::Requirement
@@ -62,14 +62,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 2.3.1
 - !ruby/object:Gem::Dependency
   name: amqp
   requirement: !ruby/object:Gem::Requirement
@@ -359,7 +359,7 @@ homepage: https://xing.github.com/beetle/
 licenses: []
 metadata:
   changelog_uri: https://github.com/xing/beetle/blob/master/RELEASE_NOTES.rdoc
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -376,7 +376,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.7
 requirements: []
 rubygems_version: 3.0.8
-signing_key: 
+signing_key:
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues
 test_files: