sidekiq-belt 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb4d769018b00b231892ae9852e6fd7d8c51074f6752332fa46ce6e606d68ba7
-  data.tar.gz: 9b05f6c1a3a505c7e6028bd6248f07ed7964a307129d7f8fc3206d96817c2b61
+  metadata.gz: 0620ca72d8c203a723b37c5b557e3cb7ddb836572b3e55c13f915b08ade54690
+  data.tar.gz: 43554ce2b06473406080e4973614e93828ec814a6d4ed410e6fabd97e7d94971
 SHA512:
-  metadata.gz: d7c1f6c6ef57da7f982bc3c1c2cfc8ffec1982ed0030a37f9b829fc9ff4e2dcabd1f606283d81014e668fa1063504f6b2dcf77837b45939a3654f91d5f99354b
-  data.tar.gz: 6cb88155712149c79268f4f0a27a49c81e60eccc890c6eed0a1a9c29b9697ff561d9730f333c16b428bbf3ca0b50a2857da1439e7b049f367b8511b3b269af3a
+  metadata.gz: 8de6db5e1e246a279e586378afbaf72aba5527b501642bb3e09e1b75413d2ac8b2f3242058f27155728e6627891f0e166e296ab735e6c895fba6428a4a524397
+  data.tar.gz: 14d4d139eef62eec7270794bcdeb73f19ea24a64980878b06b09ba2366dc9b8ad1bba77796da046962dfb648c5cfb8bdb1ac063b72d9bf6fa7c1c1497d7aeb2f

data/CHANGELOG.md

@@ -1,4 +1,11 @@
 ## [Unreleased]
+## [0.3.6] - 2024-09-27
+
+- Added force kill to instances
+
+## [0.3.5] - 2024-09-27
+
+- Fix replace_content to dynamic routes
 
 ## [0.3.4] - 2024-01-07
 

data/lib/sidekiq/belt/community/files.rb

@@ -4,6 +4,7 @@ require "sidekiq"
 
 require_relative "run_job"
 require_relative "top_label"
+require_relative "force_kill"
 
 module Sidekiq
   module Belt
@@ -12,6 +13,7 @@ module Sidekiq
         def self.use!(options = [:all])
           Sidekiq::Belt::Community::RunJob.use! if should_use?(:run_job, options)
           Sidekiq::Belt::Community::TopLabel.use! if should_use?(:top_label, options)
+          Sidekiq::Belt::Community::ForceKill.use! if should_use?(:force_kill, options)
 
           true
         end

data/lib/sidekiq/belt/community/force_kill.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require "sidekiq/web"
+require "sidekiq/web/helpers"
+require "byebug"
+
+module Sidekiq
+  module Belt
+    module Community
+      module ForceKill
+        def kill!
+          signal("KILL")
+        end
+
+        module SidekiqForceKill
+          def self.registered(app)
+            app.replace_content("/busy") do |content|
+              content.gsub!("<%= t('Stop') %></button>") do
+                "<%= t('Stop') %></button>" \
+                  "<% if process.stopping? %>" \
+                  "<a href=\"<%= root_path %>/force_kill/<%= process['identity'] %>/kill\" " \
+                  "class=\"btn btn-xs btn-danger\" data-confirm=\"<%= t('AreYouSure') %>\">" \
+                  "<%= t('Kill') %></a>" \
+                  "<% end %>"
+              end
+            end
+
+            app.get("/force_kill/:identity/kill") do
+              process = Sidekiq::ProcessSet[params["identity"]]
+
+              if process
+                process.stop!
+                process.kill!
+              end
+
+              return redirect "#{root_path}busy"
+            end
+          end
+        end
+
+        def self.use!
+          Sidekiq::Web.register(Sidekiq::Belt::Community::ForceKill::SidekiqForceKill)
+          Sidekiq::Process.prepend(Sidekiq::Belt::Community::ForceKill)
+        end
+      end
+    end
+  end
+end

data/lib/sidekiq/belt/version.rb

@@ -2,6 +2,6 @@
 
 module Sidekiq
   module Belt
-    VERSION = "0.3.4"
+    VERSION = "0.3.6"
   end
 end

data/lib/sidekiq/web_action_helper.rb

@@ -5,22 +5,30 @@ require "sidekiq/web/action"
 
 module Sidekiq
   module WebActionHelper
-    def render(engine, content, options = {})
-      begin
-        path_info = /"([^"]*)"/.match(block.source.to_s)[1]
-      rescue StandardError
-        path_info = nil
-      end
+    class ERB < ::ERB
+      def initialize(content)
+        replace_views = Sidekiq::Config::DEFAULTS[:replace_views] || {}
 
-      path_info ||= ::Rack::Utils.unescape(env["PATH_INFO"])
+        replace_views.each do |key, content_blocks|
+          next if WebRoute.new("", key, true).match("", self.class.path_info).nil?
 
-      replace_views = Sidekiq::Config::DEFAULTS[:replace_views] || {}
+          content_blocks.each do |content_block|
+            content_block.call(content)
+          end
+        end
 
-      replace_views.fetch(path_info.to_s, []).each do |content_block|
-        content_block.call(content)
+        super
+      end
+
+      class << self
+        attr_accessor :path_info
       end
+    end
+
+    def erb(content, options = {})
+      ERB.path_info = ::Rack::Utils.unescape(env["PATH_INFO"])
 
-      super(engine, content, options)
+      super
     end
 
     def self.change_layout(&block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-belt
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Danilo Jeremias da Silva
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-06-16 00:00:00.000000000 Z
+date: 2024-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -42,6 +42,7 @@ files:
 - lib/sidekiq-belt.rb
 - lib/sidekiq/belt.rb
 - lib/sidekiq/belt/community/files.rb
+- lib/sidekiq/belt/community/force_kill.rb
 - lib/sidekiq/belt/community/run_job.rb
 - lib/sidekiq/belt/community/top_label.rb
 - lib/sidekiq/belt/community/views/run_jobs.erb
@@ -62,7 +63,7 @@ metadata:
   homepage_uri: https://github.com/dannnylo/sidekiq-belt
   source_code_uri: https://github.com/dannnylo/sidekiq-belt
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -77,8 +78,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
-signing_key: 
+rubygems_version: 3.5.16
+signing_key:
 specification_version: 4
 summary: This Ruby gem enhances the capabilities of Sidekiq, Sidekiq Pro, and Sidekiq
   Enterprise by adding essential utilities.