beetle 3.3.8 → 3.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b64b9ad7d4d36c450c8219f666db52323d1d30e6f741ccb5791469f9f9c7b7a0
-  data.tar.gz: 860d8813af202e5463aa70d2b33466c0cb1d0f0ed8afe7490ae82e106c2cc3f7
+  metadata.gz: 95e3ab98a559390c7f20bb68ae99e8636c82df9a66fff22413c73459d9ff6332
+  data.tar.gz: dd0e5868943f6b2cdb9d73037851da75b380171487a0f5cb29328a8e44aaec40
 SHA512:
-  metadata.gz: b97d517694c27bfa3bcbb6d7714374b998a6e1268e0012e59a9d8e0c57e7fac0904cf978a9e5dee7c92c03f183c679ad238102704152e1f1115bedcc9280b70a
-  data.tar.gz: 63875a03bf6cd2c0221ce925d9b14d49aae0fbf547a40177ef4eee77a5913894b64df82967c45a3aecc0eff8a7631a8038e4fae1e5b7618dea3a66be030a472d
+  metadata.gz: cbec6f5dcf9bdd429442cea86190bed2960038d31241781b5a748586a76038e060654bd91c0f559b3f17ee57e41b97017859549c3c11523df76ccfddde3d022b
+  data.tar.gz: '091e597c4b84ec2bf72d14ae1875ee6e44d39770b82968c803cc4029c26d252aa24eb53f88c4893ef0f98acb496ea2c691a5bcb4f829ac1ae174228e705da852'

data/RELEASE_NOTES.rdoc

@@ -1,5 +1,11 @@
 = Release Notes
 
+== 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
+  default policy with a priority of zero to match all queues ever
+  created. This feature is optional.
+
 == Version 3.3.8
 * Avoid needless put call when updating queue policies.
   It seems the additional call to get the current definition of a policy

data/lib/beetle/configuration.rb

@@ -14,6 +14,9 @@ module Beetle
     # Name of the policy update routing key
     attr_accessor :beetle_policy_updates_routing_key
     # default logger (defaults to <tt>Logger.new(log_file)</tt>)
+    attr_accessor :broker_default_policy
+    # set this to whatever your brokers have installed as default policy. For example, if you have installed
+    # a policy that makes every queue lazy, it should be set to <tt>{"queue-moode" => "lazy"}</tt>.
     attr_accessor :logger
     # defaults to <tt>STDOUT</tt>
     attr_accessor :redis_logger
@@ -146,6 +149,7 @@ module Beetle
       self.beetle_policy_exchange_name = "beetle-policies"
       self.beetle_policy_updates_queue_name = "beetle-policy-updates"
       self.beetle_policy_updates_routing_key = "beetle.policy.update"
+      self.broker_default_policy = {}
 
       self.gc_threshold = 1.hour.to_i
       self.redis_server = "localhost:6379"

data/lib/beetle/queue_properties.rb

@@ -45,9 +45,11 @@ module Beetle
       return unless options[:dead_lettering] || options[:lazy]
 
       # no need to worry that the server has the port 5672. Net:HTTP will take care of this. See below.
-      request_url = URI("http://#{server}/api/policies/#{vhost}/#{queue_name}_policy")
+      policy_name = "#{queue_name}_policy"
+      request_url = URI("http://#{server}/api/policies/#{vhost}/#{policy_name}")
       get_request = Net::HTTP::Get.new(request_url)
       put_request = Net::HTTP::Put.new(request_url)
+      delete_request = Net::HTTP::Delete.new(request_url)
 
       # set up queue policy
       definition = {}
@@ -66,13 +68,26 @@ module Beetle
         "definition" => definition,
       }
 
+      is_default_policy = definition == config.broker_default_policy
+
       get_response = run_rabbit_http_request(request_url, get_request) do |http|
         http.request(get_request, nil)
       end
 
-      if get_response.code == "200"
+      case get_response.code
+      when "200"
         response_body = JSON.parse(get_response.body) rescue {}
-        return :ok if put_request_body.all? { |k,v| response_body[k] == v }
+        same_policy = put_request_body.all? { |k,v| response_body[k] == v }
+        if same_policy
+          if is_default_policy
+            run_rabbit_http_request(request_url, delete_request) do |http|
+              http.request(get_request, nil)
+            end
+          end
+          return :ok
+        end
+      when "404"
+        return :ok if is_default_policy
       end
 
       put_response = run_rabbit_http_request(request_url, put_request) do |http|
@@ -141,9 +156,10 @@ module Beetle
 
     def run_rabbit_http_request(uri, request, &block)
       request.basic_auth(config.user, config.password)
-      if request.class::METHOD == 'GET'
+      case request.class::METHOD
+      when 'GET'
         request["Accept"] = "application/json"
-      else
+      when 'PUT'
         request["Content-Type"] = "application/json"
       end
       http = Net::HTTP.new(uri.hostname, config.api_port)

data/lib/beetle/version.rb

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

data/test/beetle/queue_properties_test.rb

@@ -78,6 +78,36 @@ module Beetle
       @queue_properties.set_queue_policy!(@server, @queue_name, :lazy => false, :dead_lettering => true, :routing_key => "QUEUE_NAME_dead_letter")
     end
 
+    test "deletes policy if its definition corresponds to the broker default policy" do
+      @config.broker_default_policy = { "queue-mode" => "lazy" }
+      stub_request(:get, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
+        .with(basic_auth: ['guest', 'guest'])
+        .to_return(:status => 200,
+                   :body => {
+                     "vhost" => "/",
+                     "name" => "QUEUE_NAME_policy",
+                     "pattern" => "^QUEUE_NAME$",
+                     "priority" => 1,
+                     "apply-to" => "queues",
+                     "definition" => {
+                       "queue-mode" => "lazy",
+                     }}.to_json)
+      stub_request(:delete, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
+        .with(basic_auth: ['guest', 'guest'])
+        .to_return(:status => 204)
+
+      @queue_properties.set_queue_policy!(@server, @queue_name, :lazy => true, :dead_lettering => false, :routing_key => "QUEUE_NAME_dead_letter")
+    end
+
+    test "does nothing if its definition corresponds to the broker default policy and the policy does not exist on the server" do
+      @config.broker_default_policy = { "queue-mode" => "lazy" }
+      stub_request(:get, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
+        .with(basic_auth: ['guest', 'guest'])
+        .to_return(:status => 404)
+
+      @queue_properties.set_queue_policy!(@server, @queue_name, :lazy => true, :dead_lettering => false, :routing_key => "QUEUE_NAME_dead_letter")
+    end
+
     test "creates a policy by posting to the rabbitmq if lazy queues are enabled" do
       stub_request(:get, "http://localhost:15672/api/policies/%2F/QUEUE_NAME_policy")
         .with(basic_auth: ['guest', 'guest'])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beetle
 version: !ruby/object:Gem::Version
-  version: 3.3.8
+  version: 3.3.9
 platform: ruby
 authors:
 - Stefan Kaes
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny