beetle 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 803a18e6acb9d08835042be267fab8251b59818aa8b6a6d1bccce49313ec6ff3
-  data.tar.gz: 10213d5296c892cfd195ae26804333a0289c4cabd5b455fa4fd17e9e63c2ee53
+  metadata.gz: 7182d9c5ef7c4970ae13bbabe91b1fcdea45991fa85a4abb3f53cfca22597a88
+  data.tar.gz: 857b842d7c2b81ee95d374ef78d02fbe15bfbae585d6afa4988e848f1c31d164
 SHA512:
-  metadata.gz: 351ffe68580dbfadb2f71f3ff185b47371d6e7430a075dee294ba96c35198cb4dc61ee2aacd0085f531b819ae968815282dad6301647807b0019af1e9109a516
-  data.tar.gz: 450ebd9703761b25b7def68bd399788140cb05f11e2246589f4039d236a456e8773dd38fcf223c7e0b6477b0a2aca646e9818415c45f92f1e04d900879f21f5f
+  metadata.gz: 57fa3450b087d9221224e8d6700074f2ba00aef9a39cd77ffbb81709f72fa115c360f89b56741e3ece716e2d7300c5d3023ca2b4db16fd59135ac99c7dc881e3
+  data.tar.gz: d6acfd5c143adfb4ec75320265a1a29f97916344d2b041d5e5ee6cb023dac514b30e357a06b4ef9258847440b8ba6bfd8b938ab0df3400b3c696462fef7600ba

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,9 @@
 = Release Notes
 
+== Version 3.3.2
+* Changed order of queue policy application to avoid ahead of line blocking in dead letter
+  queues.
+
 == Version 3.3.1
 * It seems that there is a certain preference on connection level when
   selecting the next message to process. We try to protect against

data/Rakefile

@@ -30,13 +30,15 @@ namespace :rabbit do
     # on my machine, the rabbitmq user is not be allowed to access my files.
     # so we need to put the config file under /tmp
     config_file = "/tmp/beetle-testing-rabbitmq-#{node_name}"
-
     create_config_file config_file, web_port
 
+    enabled_plugins_file = "/tmp/beetle-testing-rabbitmq-enabled-plugins-#{node_name}"
+    create_enabled_plugins_file enabled_plugins_file
+
     puts "starting rabbit #{node_name} on port #{port}, web management port #{web_port}"
     puts "type ^C a RETURN to abort"
     sleep 1
-    exec "sudo #{script} #{node_name} #{port} #{config_file}"
+    exec "sudo #{script} #{node_name} #{port} #{config_file} #{enabled_plugins_file}"
   end
 
   def create_config_file(config_file, web_port)
@@ -48,6 +50,12 @@ namespace :rabbit do
     end
   end
 
+  def create_enabled_plugins_file(enabled_plugins_file)
+    File.open("#{enabled_plugins_file}",'w') do |f|
+      f.puts "[rabbitmq_management]."
+    end
+  end
+
   desc "start rabbit instance 1"
   task :start1 do
     start "rabbit1", 5672, 15672

data/examples/README.rdoc

@@ -8,5 +8,5 @@ windows and execute the following commands:
 
     rake rabbit:start1
     rake rabbit:start2
-    rake redis:start1
-    rake redis:start2
+    rake redis:start:master
+    rake redis:start:slave

data/lib/beetle/queue_properties.rb

@@ -23,12 +23,17 @@ module Beetle
       dead_letter_queue_name = options[:dead_letter_queue_name]
       policy_options = options.slice(:lazy, :dead_lettering)
 
+      # The order of policy creation is important.
+      # We need to create the policy on the dead letter queue first to have the message_ttl setting
+      # in place before the first message comes in. Otherwise a message will not get a ttl
+      # applied and stay in the dead letter queue forever (or until manually consumed), thus
+      # blocking the head of the queue.
+      dead_letter_queue_options = policy_options.merge(:routing_key => target_queue, :message_ttl => options[:message_ttl])
+      set_queue_policy!(server, dead_letter_queue_name, dead_letter_queue_options)
       target_queue_options = policy_options.merge(:routing_key => dead_letter_queue_name)
       set_queue_policy!(server, target_queue, target_queue_options)
-      remove_obsolete_bindings(server, target_queue, options[:bindings]) if options.has_key?(:bindings)
 
-      dead_letter_queue_options = policy_options.merge(:routing_key => target_queue, :message_ttl => options[:message_ttl])
-      set_queue_policy!(server, dead_letter_queue_name, dead_letter_queue_options)
+      remove_obsolete_bindings(server, target_queue, options[:bindings]) if options.has_key?(:bindings)
     end
 
     def set_queue_policy!(server, queue_name, options={})

data/lib/beetle/version.rb

@@ -1,3 +1,3 @@
 module Beetle
-  VERSION = "3.3.1"
+  VERSION = "3.3.2"
 end

data/script/start_rabbit

@@ -14,7 +14,7 @@ export RABBITMQ_NODENAME=$1
 # combination. See clustering on a single machine guide at <http://www.rab-
 # bitmq.com/clustering.html#single-machine> for details.
 
-# RABBITMQ_NODE_IP_ADDRESS
+export RABBITMQ_NODE_IP_ADDRESS=localhost
 # Defaults to 0.0.0.0. This can be changed if you only want to bind to one net-
 # work interface.
 
@@ -22,11 +22,9 @@ export RABBITMQ_NODE_PORT=$2
 # Defaults to 5672.
 
 export RABBITMQ_CONFIG_FILE=$3
-# RABBITMQ_CLUSTER_CONFIG_FILE
-# Defaults to /etc/rabbitmq/rabbitmq_cluster.config. If this file is present it
-# is used by the server to auto-configure a RabbitMQ cluster.  See the clustering
-# guide at <http://www.rabbitmq.com/clustering.html> for details.
+export RABBITMQ_ENABLED_PLUGINS_FILE=$4
 
 rabbitmq-server
 
 rm -f $RABBITMQ_CONFIG_FILE
+rm -f $RABBITMQ_ENABLED_PLUGINS_FILE

data/test/beetle/queue_properties_test.rb

@@ -28,13 +28,15 @@ module Beetle
         :queue_name => "QUEUE_NAME", :dead_letter_queue_name => "QUEUE_NAME_dead_letter",
         :message_ttl => 10000
       }
-      @queue_properties.expects(:set_queue_policy!).with("server", "QUEUE_NAME",
-                                                       :lazy => true, :dead_lettering => true,
-                                                       :routing_key => "QUEUE_NAME_dead_letter")
-      @queue_properties.expects(:set_queue_policy!).with("server", "QUEUE_NAME_dead_letter",
+
+      policies = sequence('policies')
+      @queue_properties.expects(:set_queue_policy!).in_sequence(policies).with("server", "QUEUE_NAME_dead_letter",
                                                        :lazy => true, :dead_lettering => true,
                                                        :routing_key => "QUEUE_NAME",
                                                        :message_ttl => 10000)
+      @queue_properties.expects(:set_queue_policy!).in_sequence(policies).with("server", "QUEUE_NAME",
+                                                       :lazy => true, :dead_lettering => true,
+                                                       :routing_key => "QUEUE_NAME_dead_letter")
       @queue_properties.update_queue_properties!(options)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-07 00:00:00.000000000 Z
+date: 2019-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -375,7 +375,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.7
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 3
 summary: High Availability AMQP Messaging with Redundant Queues