sidekiq_queue_manager 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: decb676a394e280ac75b0a45c17541551d2191ad74205c57bf8cf5b333eb4341
-  data.tar.gz: ef24c3fd05b309c5df6eb852791238d8a458393f002d371c526b8fd3dc2512ed
+  metadata.gz: 643e7129093c9ce8ed3d1c44b0066249f339ba8e05619644e35500b481f8fff6
+  data.tar.gz: fb0ca16a5c9df55ad9e384dd1c36c04adef2e88fe97dcd218896cde084f96cde
 SHA512:
-  metadata.gz: 553576ce338f3b59688ad806a5d227f021d2c2a0b84a775246724e1ba4e1c089a4f66ac796e7a155ce2da0da13b95bacd941287d31315c273b9e0a54f483f448
-  data.tar.gz: 100b3bdbf614358e6099721185ef05ed395620172fe743030cd1d64698c161afa72a75aac413cb6af450b0abef3dbbac48e71677909aa4031138c7c15a6ff032
+  metadata.gz: 878fe78f4d684a661a143de01fd6d16624ae0dbe7ab1b38d9fac4d96673e16a3615aa5f947142c8237ca6bf6841d10bfb25fb9d4e2b013835af1a57169300d79
+  data.tar.gz: ec5751c4bf9ca6be1b9b310438a22aefde78bf7c5c566cf8478cc5c9760dbd1384e12f26dd24c7b9cdfcbb60bfaccfa1f26849dd0e6f147f96becf416254fbd8

data/app/assets/javascripts/sidekiq_queue_manager/application.js

@@ -755,6 +755,9 @@ class SidekiqQueueManagerUI {
           <button class="sqm-actions-menu-item sqm-actions-danger" data-action="clear" data-queue="${queueName}">
             🗑️ Clear All Jobs
           </button>
+          <button class="sqm-actions-menu-item sqm-actions-danger" data-action="delete_queue" data-queue="${queueName}">
+            ❌ Delete Queue
+          </button>
         </div>
       </div>
     `;
@@ -847,6 +850,8 @@ class SidekiqQueueManagerUI {
         return this.unblockQueue(queueName);
       case 'clear':
         return this.clearQueue(queueName);
+      case 'delete_queue':
+        return this.deleteQueue(queueName);
       default:
         throw new Error(`Unknown action: ${action}`);
     }
@@ -1391,6 +1396,52 @@ class SidekiqQueueManagerUI {
     }
   }
 
+  async deleteQueue(queueName) {
+    const confirmed = await this.showCustomConfirm(
+      'Delete Queue Completely',
+      `Are you sure you want to PERMANENTLY DELETE the "${queueName}" queue?`,
+      'danger',
+      'This action will remove the queue completely from Sidekiq, along with all its jobs. This cannot be undone.'
+    );
+
+    if (!confirmed) return;
+
+    // Triple confirmation for queue deletion (more destructive than clearing)
+    const doubleConfirmed = await this.showCustomConfirm(
+      'Final Warning',
+      `This will PERMANENTLY DELETE the entire "${queueName}" queue!`,
+      'danger',
+      'The queue will be completely removed from Sidekiq and cannot be recovered.'
+    );
+
+    if (!doubleConfirmed) return;
+
+    const confirmation = await this.showCustomPrompt(
+      'Type Queue Name to Confirm',
+      `Type "${queueName}" exactly to confirm queue deletion:`,
+      queueName,
+      'This is your last chance to cancel this destructive operation.'
+    );
+
+    if (confirmation !== queueName) {
+      this.showNotification('Queue deletion cancelled', 'info');
+      return;
+    }
+
+    try {
+      const response = await this.apiCall(`/queues/${queueName}`, { method: 'DELETE' });
+
+      if (response.success) {
+        this.showNotification(`Queue "${queueName}" deleted permanently`, 'success');
+        await this.refreshQueues();
+      } else {
+        throw new Error(response.message || 'Failed to delete queue');
+      }
+    } catch (error) {
+      this.showNotification(`Failed to delete queue: ${error.message}`, 'error');
+    }
+  }
+
   async pauseAllQueues() {
     if (!await this.showCustomConfirm('Pause All Queues', 'Are you sure you want to pause all non-critical queues?')) {
       return;

data/app/controllers/sidekiq_queue_manager/application_controller.rb

@@ -13,6 +13,9 @@ module SidekiqQueueManager
     # Engine-specific layout
     layout 'sidekiq_queue_manager/application'
 
+    # Make mount path available to views
+    helper_method :engine_mount_path
+
     # Authentication and security using Ruby's declarative approach
     before_action :authenticate_access
     before_action :set_security_headers
@@ -164,7 +167,7 @@ module SidekiqQueueManager
     end
 
     def direct_serving_strategy
-      mount_path = sidekiq_dashboard.root_path.chomp('/')
+      mount_path = engine_mount_path
 
       {
         css_path: "#{mount_path}/assets/sidekiq_queue_manager/application.css",
@@ -174,6 +177,16 @@ module SidekiqQueueManager
       }
     end
 
+    # Get the mount path from the engine's routes
+    def engine_mount_path
+      # Extract mount path from the current request path
+      if request.path =~ %r{^(/[^/]+)}
+        Regexp.last_match(1)
+      else
+        '/sidekiq_manager' # Default fallback
+      end
+    end
+
     # Common helper for accessing main application methods
     def main_app
       @main_app ||= Rails.application.routes.url_helpers

data/app/controllers/sidekiq_queue_manager/dashboard_controller.rb

@@ -17,7 +17,7 @@ module SidekiqQueueManager
     before_action :set_queue_name, only: %i[
       queue_status pause_queue resume_queue jobs delete_job
       set_limit remove_limit set_process_limit remove_process_limit
-      block unblock clear
+      block unblock clear delete_queue
     ]
 
     # Comprehensive error handling for all controller actions
@@ -250,6 +250,17 @@ module SidekiqQueueManager
       ), status: result[:success] ? :ok : :unprocessable_entity
     end
 
+    # Delete a queue completely
+    # DELETE /queues/:name
+    def delete_queue
+      result = QueueService.delete_queue(@queue_name)
+      render json: api_response(
+        success: result[:success],
+        message: result[:message],
+        data: result[:data]
+      ), status: result[:success] ? :ok : :unprocessable_entity
+    end
+
     private
 
     # ========================================

data/app/services/sidekiq_queue_manager/queue_service.rb

@@ -202,7 +202,16 @@ module SidekiqQueueManager
 
           queue = Sidekiq::Queue[queue_name]
           operation = method_name.split('_')[0] # 'set', 'remove', 'block', 'unblock'
-          attribute = method_name.match(/_(queue_|process_)?(.+)$/)[2] # 'limit', 'process_limit'
+
+          # Extract the correct attribute name based on the method
+          attribute = case method_name
+                      when /set_queue_limit|remove_queue_limit/
+                        'limit' # queue.limit for queue limits
+                      when /set_process_limit|remove_process_limit/
+                        'process_limit' # queue.process_limit for process limits
+                      else
+                        method_name.split('_', 2)[1] # fallback for block/unblock operations
+                      end
 
           perform_queue_operation(queue, queue_name, operation, attribute, *args)
         rescue StandardError => e
@@ -224,18 +233,42 @@ module SidekiqQueueManager
         handle_service_error(e, "clear queue '#{queue_name}'")
       end
 
+      def delete_queue(queue_name)
+        return failure_response('Invalid queue name') unless valid_queue?(queue_name)
+        return failure_response('Cannot delete critical queue') if critical_queue?(queue_name)
+
+        queue = Sidekiq::Queue[queue_name]
+        jobs_count = queue.size
+
+        # Clear all jobs first
+        queue.clear
+
+        # Complete cleanup of queue from Redis
+        Sidekiq.redis do |conn|
+          # Remove queue from the queues set
+          conn.srem('queues', queue_name)
+
+          # Delete the actual queue key from Redis
+          conn.del("queue:#{queue_name}")
+
+          # Clean up any related keys (like paused queue markers)
+          conn.del("queue:#{queue_name}:paused")
+        end
+
+        log_operation("Queue '#{queue_name}' deleted completely - #{jobs_count} jobs removed")
+        success_response("Queue '#{queue_name}' deleted successfully", jobs_cleared: jobs_count)
+      rescue StandardError => e
+        handle_service_error(e, "delete queue '#{queue_name}'")
+      end
+
       private
 
       # ========================================
       # Queue Information Helpers
       # ========================================
 
-      def available_queues
-        @available_queues ||= discover_queues
-      end
-
       # Ruby's functional approach to queue discovery
-      def discover_queues
+      def available_queues
         [
           # Method 1: Sidekiq's built-in discovery
           -> { Sidekiq::Queue.all.map(&:name) },

data/app/views/layouts/sidekiq_queue_manager/application.html.erb

@@ -54,7 +54,7 @@
     <!-- Configuration for JavaScript -->
     <script type="text/javascript">
       window.SidekiqQueueManagerConfig = {
-        mountPath: '<%= sidekiq_dashboard.root_path %>',
+        mountPath: '<%= engine_mount_path %>',
         refreshInterval: <%= SidekiqQueueManager.configuration.refresh_interval %>,
         theme: '<%= SidekiqQueueManager.configuration.theme %>',
         criticalQueues: <%= SidekiqQueueManager.configuration.critical_queues.to_json.html_safe %>,

data/config/routes.rb

@@ -31,6 +31,7 @@ SidekiqQueueManager::Engine.routes.draw do
   get '/queues/:name/jobs', to: 'dashboard#jobs', as: :queue_jobs
   delete '/queues/:name/delete_job', to: 'dashboard#delete_job', as: :delete_queue_job
   post '/queues/:name/clear', to: 'dashboard#clear', as: :clear_queue
+  delete '/queues/:name', to: 'dashboard#delete_queue', as: :delete_queue
 
   # Queue limits and configuration
   post '/queues/:name/set_limit', to: 'dashboard#set_limit', as: :set_queue_limit

data/lib/sidekiq_queue_manager/logging_middleware.rb

@@ -8,21 +8,28 @@ module SidekiqQueueManager
     end
 
     def call(env)
-      # Only log requests to our gem's paths
-      if env['PATH_INFO'].start_with?('/sidekiq_dashboard')
-        start_time = Time.current
-
-        status, headers, body = @app.call(env)
+      start_time = Time.current
+      status, headers, body = @app.call(env)
 
+      # Only log if this request was handled by our engine
+      if handled_by_sidekiq_queue_manager?(env)
         end_time = Time.current
         duration = (end_time - start_time) * 1000 # milliseconds
+        path_info = env['PATH_INFO'] || ''
 
-        Rails.logger.info "[SidekiqQueueManager] #{env['REQUEST_METHOD']} #{env['PATH_INFO']} - #{status} (#{duration.round(2)}ms)"
-
-        [status, headers, body]
-      else
-        @app.call(env)
+        Rails.logger.info "[SidekiqQueueManager] #{env['REQUEST_METHOD']} #{path_info} - #{status} (#{duration.round(2)}ms)"
       end
+
+      [status, headers, body]
+    end
+
+    private
+
+    # Check if the request was handled by our engine controllers
+    def handled_by_sidekiq_queue_manager?(env)
+      # Check if the controller class is from our engine
+      controller_class = env['action_controller.instance']&.class&.name
+      controller_class&.start_with?('SidekiqQueueManager::')
     end
   end
 end

data/lib/sidekiq_queue_manager/version.rb

@@ -7,6 +7,6 @@ module SidekiqQueueManager
   # - MAJOR: Incompatible API changes
   # - MINOR: Add functionality in backward compatible manner
   # - PATCH: Backward compatible bug fixes
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_queue_manager
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jamal Awad