From 1dbef7e985ca2ea23e467c8128f5e1fa57d7d04e Mon Sep 17 00:00:00 2001
From: Viktor Erlingsson <viktor@84codes.com>
Date: Fri, 10 Jan 2025 14:52:07 +0100
Subject: [PATCH] use pagination to get all queues. Make checking for which
 queues to delete much quicker by reading .queue files instead of computing
 SHA1 where possible

---
 src/lavinmqctl.cr | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/lavinmqctl.cr b/src/lavinmqctl.cr
index a7be5f83cb..30cdfb94b3 100644
--- a/src/lavinmqctl.cr
+++ b/src/lavinmqctl.cr
@@ -312,14 +312,16 @@ class LavinMQCtl
 
   MAX_PAGE_SIZE = 10_000
 
-  private def get(url, page = 1, items = [] of JSON::Any)
-    resp = http.get("#{url}?page=#{page}&page_size=#{MAX_PAGE_SIZE}", @headers)
+  private def get(url, columns = nil, page = 1, items = [] of JSON::Any)
+    uri = "#{url}?page=#{page}&page_size=#{MAX_PAGE_SIZE}"
+    uri += "&columns=#{columns}" if columns
+    resp = http.get(uri, @headers)
     handle_response(resp, 200)
     if data = JSON.parse(resp.body).as_h?
       items += data["items"].as_a
       page = data["page"].as_i
       if page < data["page_count"].as_i
-        return get(url, page + 1, items)
+        return get(url, columns, page + 1, items)
       end
     else
       abort "invalid data"
@@ -692,17 +694,14 @@ class LavinMQCtl
 
     vhosts = [vhost]
     unless vhost # no vhost specified, get all vhosts
-      resp = http.get "/api/vhosts", @headers
-      handle_response(resp, 200)
-      if vhost_list = JSON.parse(resp.body).as_a?
-        vhosts = vhost_list.map do |u|
-          next unless v = u.as_h?
-          v["name"].to_s
-        end
+      vhosts = get("/api/vhosts").map do |u|
+        next unless v = u.as_h?
+        v["name"].to_s
       end
     end
 
     vhosts.compact.each do |current_vhost|
+      puts "Cleaning up vhost #{current_vhost} ..." unless quiet?
       queue_dirs = [] of String
       vhost_data_dir = File.join(data_dir, Digest::SHA1.hexdigest(current_vhost))
       begin
@@ -718,13 +717,16 @@ class LavinMQCtl
       rescue e : File::NotFoundError
       end
 
-      resp = http.get "/api/queues/#{URI.encode_www_form(current_vhost)}", @headers
-      handle_response(resp, 200)
-      if queues = JSON.parse(resp.body).as_a?
-        queues.each do |q|
-          next unless v = q.as_h?
-          queue_dirs.reject! { |path| path.includes?(Digest::SHA1.hexdigest(v["name"].to_s)) }
-        end
+      queues = get("/api/queues/#{URI.encode_www_form(current_vhost)}","name")
+
+      Dir.glob("#{vhost_data_dir}/*/.queue").each do |dir|
+        queues.delete({ "name"=> File.read(dir) })
+        queue_dirs.delete(dir[0..-8])
+      end
+
+      queues.each do |q|
+        next unless v = q.as_h?
+        queue_dirs.reject! { |path| path.includes?(Digest::SHA1.hexdigest(v["name"].to_s)) }
       end
 
       queue_dirs.each do |dir|