sneakers-queue-migrator 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc0b131523f71a4bd19d4d5d0275fbe7e47814e55ad51b0d927b2672ed7578cb
-  data.tar.gz: 3ee9adb466b69696575011fd7a4a192cac88f9370226b33566cb07a084a637f8
+  metadata.gz: cf52a4bc1cb067db797ea5ea317fdbaf21bbcf30c1770b9324dce3e809387b95
+  data.tar.gz: 0ae00f97a9ba327a9edd0ff546f9bcd26101ecee8104029d0e9d0115830cadea
 SHA512:
-  metadata.gz: 663174974230df88b4c71ed747c682c5329347d5c815087fd0c59cfa93d05c2e05d8dd196d1345a05b2c4e787850513fc40e727e5a0a7ba61dd63ed0d63677d1
-  data.tar.gz: b4023d485167c76211c06ba6765c550589fceaae77e1c6ed47d91a22d6d228a31b673168d06429a8fbc2b207e94f8845b06243b13386a71e3dc607403058f724
+  metadata.gz: 67a61910c8b7a2acd86ab0c14f097390f76af0d6bf1f6ec240df4bb75f49aa953e325852b0270356e35b2e7b521e28adeb41143586bce104dafbd0f7335cf3c7
+  data.tar.gz: 3a8ea11e7cb1683017b3f246378fa377029221a1b10385f518b0d9d65f41684dad5c7de48f6fd2ccf476fdb72990f88c37ebc34cc6086c571d04447bf6d0f132

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sneakers-queue-migrator (0.1.0)
+    sneakers-queue-migrator (0.1.1)
       bunny (~> 2.0)
       json (~> 2.0)
 

data/lib/sneakers/migrator/version.rb

@@ -2,6 +2,6 @@
 
 module Sneakers
   module Migrator
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/sneakers/migrator.rb

@@ -25,16 +25,26 @@ module Sneakers
             raise Error, "You must have either the 'sneakers' or 'kicks' gem installed to use subscriber discovery."
           end
         end
-        # Load all subscribers
+
+        # Load all subscribers (recursively)
         subscriber_paths.each do |path|
-          Dir[File.join(path, "*.rb")].each { |f| require f }
+          Dir[File.join(path, "**", "*.rb")].sort.each do |f|
+            logger.puts "Migrator: Loading subscriber file: #{f}"
+            require f
+          end
         end
+
         # Find all worker classes for the loaded framework
         subscribers = ObjectSpace.each_object(Class).select do |klass|
           klass.included_modules.include?(::Sneakers::Worker)
         rescue StandardError
           false
         end
+
+        # output found subscribers
+        logger.puts "Migrator: Found #{subscribers.size} subscribers:"
+        subscribers.each { |s| logger.puts "  - #{s.name}" }
+
         queues = subscribers.map do |klass|
           opts = klass.instance_variable_get(:@queue_opts) || {}
           name = klass.instance_variable_get(:@queue_name) ||
@@ -59,90 +69,98 @@ module Sneakers
         all_queues = fetch_all_queues(amqp_api_url, rabbitmq_api_user, rabbitmq_api_pass)
 
         queues.each do |q|
-          queue_info = all_queues.find { |info| info["name"] == q[:name] }
-          tmp_queue_name = "#{q[:name]}_tmp"
-          if queue_info.nil?
+          existing_queue_info = all_queues.find { |info| info["name"] == q[:name] }
+          if existing_queue_info.nil?
             logger.puts "Migrator: Queue #{q[:name]} does not exist, creating..."
             ch.queue(q[:name], durable: q[:durable], arguments: q[:arguments])
             next
           end
-          current_args = (queue_info["arguments"] || {}).transform_keys(&:to_s)
-          desired_args = (q[:arguments] || {}).transform_keys(&:to_s)
-          logger.puts "Migrator: Checking queue: #{q[:name]}"
-          logger.puts "Migrator: Current args: #{current_args.inspect}"
-          logger.puts "Migrator: Desired args: #{desired_args.inspect}"
-          if queue_args_match?({ arguments: current_args }, desired_args)
-            logger.puts "Migrator: Queue #{q[:name]} arguments match, nothing to do."
-            next
-          end
-          logger.puts "Migrator: Queue #{q[:name]} arguments differ, migrating..."
+          migrate_queue!(q, ch, amqp_api_url, rabbitmq_api_user, rabbitmq_api_pass, logger, existing_queue_info)
+        end
+      end
 
-          # --- Fetch and store bindings (exchange/routing_key pairs) ---
-          bindings = fetch_queue_bindings(amqp_api_url, rabbitmq_api_user, rabbitmq_api_pass, queue_info)
-          logger.puts "Migrator: Found bindings: #{bindings.inspect}"
+      private
 
-          ch.queue(tmp_queue_name, durable: queue_info["durable"], arguments: desired_args)
-          Array(q[:routing_keys]).each do |rk|
-            next if rk.nil? || rk.empty?
+      def migrate_queue!(q, ch, amqp_api_url, rabbitmq_api_user, rabbitmq_api_pass, logger, existing_queue_info)
+        tmp_queue_name = "#{q[:name]}_tmp"
+        current_args = (existing_queue_info["arguments"] || {}).transform_keys(&:to_s)
+        desired_args = (q[:arguments] || {}).transform_keys(&:to_s)
+        logger.puts "Migrator: Checking queue: #{q[:name]}"
+        if queue_args_match?({ arguments: current_args }, desired_args)
+          logger.puts "Migrator: Queue #{q[:name]} arguments match, nothing to do."
+          return
+        end
+        logger.puts "Migrator: Current args: #{current_args.inspect}"
+        logger.puts "Migrator: Desired args: #{desired_args.inspect}"
 
-            # bind the tmp queue first so new messages go somewhere
-            ch.queue(tmp_queue_name).bind(q[:exchange], routing_key: rk)
-            # unbind the original queue from the exchange
-            logger.puts "Migrator: Unbinding queue #{q[:name]} from exchange #{q[:exchange]} with routing key #{rk}"
-            ch.queue(q[:name], passive: true).unbind(q[:exchange], routing_key: rk)
-          end
-          count = 0
-          queue = ch.queue(q[:name], passive: true)
-          loop do
-            delivery_info, headers, payload = queue.pop
-            break unless payload
-
-            logger.puts "Migrator: Moving message to #{tmp_queue_name}: payload=#{payload.inspect}, headers=#{headers.inspect}, delivery_info=#{delivery_info.inspect}"
-            safe_basic_publish(ch, payload, tmp_queue_name, headers)
-            count += 1
-          end
-          logger.puts "Migrator: Moved #{count} messages to #{tmp_queue_name}"
-          ch.queue(q[:name], passive: true).delete
-
-          # create new queue with desired arguments
-          logger.puts "Migrator: Recreating queue #{q[:name]} with new arguments: #{q[:arguments].inspect}"
-          ch.queue(q[:name], durable: q[:durable], arguments: q[:arguments])
-
-          # --- Restore bindings ---
-          bindings.each do |binding|
-            # Only restore if it's a binding from an exchange (not from a queue)
-            next unless binding["source"] && !binding["source"].empty?
-
-            ch.queue(q[:name]).bind(binding["source"], routing_key: binding["routing_key"])
-            logger.puts "Migrator: Restored binding: exchange=#{binding["source"]}, routing_key=#{binding["routing_key"]}"
-            # now drop the tmp queue binding
-            ch.queue(tmp_queue_name).unbind(binding["source"], routing_key: binding["routing_key"])
-          rescue StandardError => e
-            logger.puts "Migrator: Failed to restore binding: #{e.class}: #{e.message}"
-          end
+        vhost = existing_queue_info["vhost"] || "/"
 
-          count = 0
-          tmp_queue = ch.queue(tmp_queue_name, passive: true)
-          loop do
-            delivery_info, headers, payload = tmp_queue.pop
-            break unless payload
+        # --- Fetch and store bindings (exchange/routing_key pairs) ---
+        bindings = fetch_queue_bindings(amqp_api_url, rabbitmq_api_user, rabbitmq_api_pass, vhost, existing_queue_info["name"])
+        logger.puts "Migrator: Found bindings: #{bindings.inspect}"
 
-            logger.puts "Migrator: Moving message back to #{q[:name]}: payload=#{payload.inspect}, headers=#{headers.inspect}, delivery_info=#{delivery_info.inspect}"
-            safe_basic_publish(ch, payload, q[:name], headers)
-            count += 1
-          end
-          logger.puts "Migrator: Moved #{count} messages to #{q[:name]}"
-          ch.queue(tmp_queue_name, passive: true).delete
-          logger.puts "Migrator: Migration for #{q[:name]} complete."
+        ch.queue(tmp_queue_name, durable: existing_queue_info["durable"], arguments: desired_args)
+        Array(q[:routing_keys]).each do |rk|
+          next if rk.nil? || rk.empty?
+
+          # bind the tmp queue first so new messages go somewhere
+          ch.queue(tmp_queue_name).bind(q[:exchange], routing_key: rk)
+          # unbind the original queue from the exchange
+          logger.puts "Migrator: Unbinding queue #{q[:name]} from exchange #{q[:exchange]} with routing key #{rk}"
+          ch.queue(q[:name], passive: true).unbind(q[:exchange], routing_key: rk)
+        end
+        count = 0
+        queue = ch.queue(q[:name], passive: true)
+        loop do
+          delivery_info, headers, payload = queue.pop
+          break unless payload
+
+          logger.puts "Migrator: Moving message to #{tmp_queue_name}: payload=#{payload.inspect}, headers=#{headers.inspect}, delivery_info=#{delivery_info.inspect}"
+          safe_basic_publish(ch, payload, tmp_queue_name, headers)
+          count += 1
+        end
+        logger.puts "Migrator: Moved #{count} messages to #{tmp_queue_name}"
+        ch.queue(q[:name], passive: true).delete
+
+        # create new queue with desired arguments
+        logger.puts "Migrator: Recreating queue #{q[:name]} with new arguments: #{q[:arguments].inspect}"
+        ch.queue(q[:name], durable: q[:durable], arguments: q[:arguments])
+
+        # --- Restore bindings ---
+        bindings.each do |binding|
+          # Only restore if it's a binding from an exchange (not from a queue)
+          next unless binding["source"] && !binding["source"].empty?
+
+          ch.queue(q[:name]).bind(binding["source"], routing_key: binding["routing_key"])
+          logger.puts "Migrator: Restored binding: exchange=#{binding["source"]}, routing_key=#{binding["routing_key"]}"
+          # now drop the tmp queue binding
+          ch.queue(tmp_queue_name).unbind(binding["source"], routing_key: binding["routing_key"])
+        rescue StandardError => e
+          logger.puts "Migrator: Failed to restore binding: #{e.class}: #{e.message}"
         end
-        ch.close
-        conn.close
+
+        count = 0
+        tmp_queue = ch.queue(tmp_queue_name, passive: true)
+        loop do
+          delivery_info, headers, payload = tmp_queue.pop
+          break unless payload
+
+          logger.puts "Migrator: Moving message back to #{q[:name]}: payload=#{payload.inspect}, headers=#{headers.inspect}, delivery_info=#{delivery_info.inspect}"
+          safe_basic_publish(ch, payload, q[:name], headers)
+          count += 1
+        end
+        logger.puts "Migrator: Moved #{count} messages to #{q[:name]}"
+        ch.queue(tmp_queue_name, passive: true).delete
+        logger.puts "Migrator: Migration for #{q[:name]} complete."
+      rescue Bunny::NotFound => e
+        logger.puts "Migrator: Queue #{q[:name]} not found, skipping migration. Error: #{e.message}"
+      rescue StandardError => e
+        logger.puts "Migrator: Error migrating queue #{q[:name]}: #{e.class}: #{e.message}"
+        raise
       end
 
       # Fetches all bindings for a queue using the RabbitMQ Management API
-      def fetch_queue_bindings(api_url, user, pass, queue_info)
-        vhost = queue_info["vhost"] || "/"
-        queue_name = queue_info["name"]
+      def fetch_queue_bindings(api_url, user, pass, vhost, queue_name)
         uri = URI.parse(api_url)
         scheme = uri.scheme || "http"
         host = uri.host
@@ -160,8 +178,6 @@ module Sneakers
         JSON.parse(res.body)
       end
 
-      private
-
       def fetch_all_queues(api_url, user, pass)
         uri = URI.parse(api_url)
         scheme = uri.scheme || "http"

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sneakers-queue-migrator
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Mike Gane
@@ -54,6 +54,7 @@ files:
 - docker-compose.yml
 - lib/sneakers/migrator.rb
 - lib/sneakers/migrator/version.rb
+- renovate.json
 - sneakers-queue-migrator.gemspec
 homepage: https://gitlab.nexdev.uk/nexus-mods/public/sneakers-queue-migrator
 licenses: []