RubyGems - sidekiq-status - Versions diffs - 3.0.3 → 4.0.0 - Mend

sidekiq-status 3.0.3 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (40) hide show

checksums.yaml +4 -4
data/.devcontainer/Dockerfile +2 -0
data/.devcontainer/README.md +57 -0
data/.devcontainer/devcontainer.json +55 -0
data/.devcontainer/docker-compose.yml +19 -0
data/.github/workflows/ci.yaml +9 -6
data/Appraisals +14 -6
data/CHANGELOG.md +12 -0
data/Dockerfile +5 -0
data/README.md +756 -41
data/Rakefile +153 -0
data/docker-compose.yml +15 -0
data/gemfiles/{sidekiq_6.1.gemfile → sidekiq_7.0.gemfile} +1 -1
data/gemfiles/sidekiq_7.3.gemfile +7 -0
data/gemfiles/sidekiq_8.0.gemfile +7 -0
data/gemfiles/{sidekiq_6.x.gemfile → sidekiq_8.x.gemfile} +1 -1
data/lib/sidekiq-status/client_middleware.rb +4 -3
data/lib/sidekiq-status/helpers.rb +94 -0
data/lib/sidekiq-status/server_middleware.rb +6 -21
data/lib/sidekiq-status/storage.rb +12 -3
data/lib/sidekiq-status/version.rb +1 -1
data/lib/sidekiq-status/web.rb +67 -93
data/lib/sidekiq-status/worker.rb +6 -10
data/lib/sidekiq-status.rb +21 -5
data/sidekiq-status.gemspec +7 -1
data/spec/environment.rb +12 -1
data/spec/lib/sidekiq-status/client_middleware_spec.rb +8 -0
data/spec/lib/sidekiq-status/server_middleware_spec.rb +13 -0
data/spec/lib/sidekiq-status/web_spec.rb +72 -3
data/spec/lib/sidekiq-status/worker_spec.rb +3 -3
data/spec/lib/sidekiq-status_spec.rb +20 -3
data/spec/spec_helper.rb +3 -8
data/spec/support/test_jobs.rb +11 -0
data/spec/test_environment.rb +1 -0
data/web/assets/statuses.css +124 -0
data/web/assets/statuses.js +24 -0
data/web/views/status.erb +131 -93
data/web/views/status_not_found.erb +1 -1
data/web/views/statuses.erb +23 -79
metadata +93 -14

data/Rakefile CHANGED Viewed

@@ -9,3 +9,156 @@ RSpec::Core::RakeTask.new(:spec)
 task :test => :spec
 task :default => :spec
+desc "Launch a minimal server with Sidekiq UI at /sidekiq"
+task :server do
+  require 'webrick'
+  require 'rack'
+  require 'rack/session'
+  require 'stringio'
+  require 'sidekiq'
+  require 'sidekiq/web'
+  require 'sidekiq-status'
+  # Create a Rack application
+  app = Rack::Builder.new do
+    # Add session middleware for Sidekiq::Web CSRF protection
+    use Rack::Session::Cookie,
+        secret: ENV['SESSION_SECRET'] || 'development_secret_key_that_is_definitely_long_enough_for_rack_session_cookie_middleware',
+        same_site: true,
+        max_age: 86400
+    map "/sidekiq" do
+      run Sidekiq::Web
+    end
+    map "/" do
+      run lambda { |env|
+        [
+          200,
+          { 'Content-Type' => 'text/html' },
+          [<<~HTML
+            <!DOCTYPE html>
+            <html>
+            <head>
+              <title>Sidekiq Status Server</title>
+            </head>
+            <body>
+              <h1>Sidekiq Status Server</h1>
+              <p>The Sidekiq web interface is available at <a href="/sidekiq">/sidekiq</a></p>
+            </body>
+            </html>
+          HTML
+          ]
+        ]
+      }
+    end
+  end
+  puts "Starting server on http://localhost:9292"
+  puts "Sidekiq web interface available at http://localhost:9292/sidekiq"
+  puts "Press Ctrl+C to stop the server"
+  # Use WEBrick with a proper Rack handler
+  server = WEBrick::HTTPServer.new(Port: 9292, Host: '0.0.0.0')
+  # Mount the Rack app properly
+  server.mount_proc '/' do |req, res|
+    begin
+      # Construct proper Rack environment
+      env = {
+        'REQUEST_METHOD' => req.request_method,
+        'PATH_INFO' => req.path_info || req.path,
+        'QUERY_STRING' => req.query_string || '',
+        'REQUEST_URI' => req.request_uri.to_s,
+        'HTTP_HOST' => req.host,
+        'SERVER_NAME' => req.host,
+        'SERVER_PORT' => req.port.to_s,
+        'SCRIPT_NAME' => '',
+        'rack.input' => StringIO.new(req.body || ''),
+        'rack.errors' => $stderr,
+        'rack.version' => [1, 3],
+        'rack.url_scheme' => 'http',
+        'rack.multithread' => true,
+        'rack.multiprocess' => false,
+        'rack.run_once' => false
+      }
+      # Add request headers to environment
+      req.header.each do |key, values|
+        env_key = key.upcase.tr('-', '_')
+        env_key = "HTTP_#{env_key}" unless %w[CONTENT_TYPE CONTENT_LENGTH].include?(env_key)
+        env[env_key] = values.first if values.any?
+      end
+      # Call the Rack app
+      status, headers, body = app.call(env)
+      # Set response
+      res.status = status
+      headers.each { |k, v| res[k] = v } if headers
+      # Handle response body
+      if body.respond_to?(:each)
+        body_content = ""
+        body.each { |chunk| body_content << chunk.to_s }
+        res.body = body_content
+      else
+        res.body = body.to_s
+      end
+    rescue => e
+      res.status = 500
+      res['Content-Type'] = 'text/plain'
+      res.body = "Internal Server Error: #{e.message}"
+      puts "Error: #{e.message}\n#{e.backtrace.join("\n")}"
+    end
+  end
+  trap('INT') { server.shutdown }
+  begin
+    server.start
+  rescue Interrupt
+    puts "\nServer stopped."
+  end
+end
+desc "Starts an IRB session with Sidekiq, Sidekiq::Status, and the testing jobs loaded"
+task :irb do
+  require 'irb'
+  require 'sidekiq-status'
+  require_relative 'spec/support/test_jobs'
+  Sidekiq.configure_server do |config|
+    Sidekiq::Status.configure_server_middleware config
+  end
+  # Configure Sidekiq if needed
+  Sidekiq.configure_client do |config|
+    Sidekiq::Status.configure_client_middleware config
+    config.redis = { url: ENV['REDIS_URL'] || 'redis://localhost:6379' }
+  end
+  puts "="*60
+  puts "IRB Session with Sidekiq Status"
+  puts ""
+  puts "To launch a sidekiq worker, run:"
+  puts "  bundle exec sidekiq -r ./spec/environment.rb"
+  puts ""
+  puts "="*60
+  puts "Available job classes:"
+  puts "  StubJob, LongJob, DataJob, ProgressJob,"
+  puts "  FailingJob, ExpiryJob, etc."
+  puts ""
+  puts "Example usage:"
+  puts "  job_id = StubJob.perform_async"
+  puts "  job_id = LongJob.perform_async(0.5)"
+  puts "  Sidekiq::Status.status(job_id)"
+  puts "  Sidekiq::Status.get_all"
+  puts "="*60
+  puts ""
+  ARGV.clear # Clear ARGV to prevent IRB from trying to parse them
+  IRB.start
+end

data/docker-compose.yml ADDED Viewed

@@ -0,0 +1,15 @@
+# Run the test suite with docker compose
+services:
+  sidekiq-status:
+    build: .
+    environment:
+      - REDIS_URL=redis://redis
+    volumes:
+      - .:/app
+    working_dir: /app
+    command: bundle exec appraisal rake
+    depends_on:
+      - redis
+  redis:
+    image: redis:7.4.0

data/gemfiles/{sidekiq_6.1.gemfile → sidekiq_7.0.gemfile} RENAMED Viewed

@@ -2,6 +2,6 @@
 source "https://rubygems.org"
-gem "sidekiq", "~> 6.1"
+gem "sidekiq", "~> 7.0.0"
 gemspec path: "../"

data/gemfiles/sidekiq_7.3.gemfile ADDED Viewed

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+source "https://rubygems.org"
+gem "sidekiq", "~> 7.3.0"
+gemspec path: "../"

data/gemfiles/sidekiq_8.0.gemfile ADDED Viewed

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+source "https://rubygems.org"
+gem "sidekiq", "~> 8.0.0"
+gemspec path: "../"

data/gemfiles/{sidekiq_6.x.gemfile → sidekiq_8.x.gemfile} RENAMED Viewed

@@ -2,6 +2,6 @@
 source "https://rubygems.org"
-gem "sidekiq", "~> 6"
+gem "sidekiq", "~> 8"
 gemspec path: "../"

data/lib/sidekiq-status/client_middleware.rb CHANGED Viewed

@@ -22,7 +22,7 @@ module Sidekiq::Status
     def call(worker_class, msg, queue, redis_pool=nil)
       # Determine the actual job class
-      klass = msg["args"][0]["job_class"] || worker_class rescue worker_class
+      klass = (!msg["args"][0].is_a?(String) && msg["args"][0]["job_class"]) || worker_class rescue worker_class
       job_class = if klass.is_a?(Class)
                     klass
                   elsif Module.const_defined?(klass)
@@ -37,7 +37,8 @@ module Sidekiq::Status
           jid: msg['jid'],
           status: :queued,
           worker: JOB_CLASS.new(msg, queue).display_class,
-          args: display_args(msg, queue)
+          args: display_args(msg, queue),
+          enqueued_at: Time.now.to_i
         }
         store_for_id msg['jid'], initial_metadata, job_class.new.expiration || @expiration, redis_pool
       end
@@ -57,7 +58,7 @@ module Sidekiq::Status
   # Helper method to easily configure sidekiq-status client middleware
   # whatever the Sidekiq version is.
-  # @param [Sidekiq] sidekiq_config the Sidekiq config
+  # @param [Sidekiq::Config] sidekiq_config the Sidekiq config
   # @param [Hash] client_middleware_options client middleware initialization options
   # @option client_middleware_options [Fixnum] :expiration ttl for complete jobs
   def self.configure_client_middleware(sidekiq_config, client_middleware_options = {})

data/lib/sidekiq-status/helpers.rb ADDED Viewed

@@ -0,0 +1,94 @@
+module Sidekiq::Status
+  module Web
+    module Helpers
+      COMMON_STATUS_HASH_KEYS = %w(enqueued_at started_at updated_at ended_at jid status worker args label pct_complete total at message elapsed eta)
+      def safe_url_params(key)
+        return url_params(key) if Sidekiq.major_version >= 8
+        request.params[key.to_s]
+      end
+      def safe_route_params(key)
+        return route_params(key) if Sidekiq.major_version >= 8
+        env["rack.route_params"][key.to_sym]
+      end
+      def csrf_tag
+        "<input type='hidden' name='authenticity_token' value='#{env[:csrf_token]}'/>"
+      end
+      def poll_path
+        "?#{request.query_string}" if safe_url_params("poll")
+      end
+      def sidekiq_status_template(name)
+        path = File.join(VIEW_PATH, name.to_s) + ".erb"
+        File.open(path).read
+      end
+      def add_details_to_status(status)
+        status['label'] = status_label(status['status'])
+        status["pct_complete"] ||= pct_complete(status)
+        status["elapsed"] ||= elapsed(status).to_s
+        status["eta"] ||= eta(status).to_s
+        status["custom"] = process_custom_data(status)
+        return status
+      end
+      def process_custom_data(hash)
+        hash.reject { |key, _| COMMON_STATUS_HASH_KEYS.include?(key) }
+      end
+      def pct_complete(status)
+        return 100 if status['status'] == 'complete'
+        Sidekiq::Status::pct_complete(status['jid']) || 0
+      end
+      def elapsed(status)
+        started = Sidekiq::Status.started_at(status['jid'])
+        return nil unless started
+        case status['status']
+        when 'complete', 'failed', 'stopped', 'interrupted'
+          ended = Sidekiq::Status.ended_at(status['jid'])
+          return nil unless ended
+          ended - started
+        when 'working', 'retrying'
+          Time.now.to_i - started
+        end
+      end
+      def eta(status)
+        Sidekiq::Status.eta(status['jid']) if status['status'] == 'working'
+      end
+      def status_label(status)
+        case status
+        when 'complete'
+          'success'
+        when 'working', 'retrying'
+          'warning'
+        when 'queued'
+          'primary'
+        else
+          'danger'
+        end
+      end
+      def has_sort_by?(value)
+        ["worker", "status", "updated_at", "pct_complete", "message", "args", "elapsed"].include?(value)
+      end
+      def retry_job_action
+        job = Sidekiq::RetrySet.new.find_job(safe_url_params("jid"))
+        job ||= Sidekiq::DeadSet.new.find_job(safe_url_params("jid"))
+        job.retry if job
+        throw :halt, [302, { "Location" => request.referer }, []]
+      end
+      def delete_job_action
+        Sidekiq::Status.delete(safe_url_params("jid"))
+        throw :halt, [302, { "Location" => request.referer }, []]
+      end
+    end
+  end
+end

data/lib/sidekiq-status/server_middleware.rb CHANGED Viewed

@@ -1,13 +1,8 @@
-if Sidekiq.major_version >= 5
-  require 'sidekiq/job_retry'
-end
+require 'sidekiq/job_retry'
 module Sidekiq::Status
   # Should be in the server middleware chain
   class ServerMiddleware
-    DEFAULT_MAX_RETRY_ATTEMPTS = Sidekiq.major_version >= 5 ? Sidekiq::JobRetry::DEFAULT_MAX_RETRY_ATTEMPTS : 25
     include Storage
     # Parameterized initialization, use it when adding middleware to server chain
@@ -34,7 +29,7 @@ module Sidekiq::Status
       expiry = @expiration
       # Determine the actual job class
-      klass = msg["args"][0]["job_class"] || msg["class"] rescue msg["class"]
+      klass = (!msg["args"][0].is_a?(String) && msg["args"][0]["job_class"]) || msg["class"] rescue msg["class"]
       job_class = klass.is_a?(Class) ? klass : Module.const_get(klass)
       # Bypass unless this is a Sidekiq::Status::Worker job
@@ -58,7 +53,7 @@ module Sidekiq::Status
       rescue Exception
         status = :failed
         if msg['retry']
-          if retry_attempt_number(msg) < retry_attempts_from(msg['retry'], DEFAULT_MAX_RETRY_ATTEMPTS)
+          if retry_attempt_number(msg) < retry_attempts_from(msg['retry'], Sidekiq::JobRetry::DEFAULT_MAX_RETRY_ATTEMPTS)
             status = :retrying
           end
         end
@@ -71,7 +66,7 @@ module Sidekiq::Status
     def retry_attempt_number(msg)
       if msg['retry_count']
-        msg['retry_count'] + sidekiq_version_dependent_retry_offset
+        msg['retry_count'] + 1
       else
         0
       end
@@ -80,26 +75,16 @@ module Sidekiq::Status
     def retry_attempts_from(msg_retry, default)
       msg_retry.is_a?(Integer) ? msg_retry : default
     end
-    def sidekiq_version_dependent_retry_offset
-      Sidekiq.major_version >= 4 ? 1 : 0
-    end
   end
   # Helper method to easily configure sidekiq-status server middleware
   # whatever the Sidekiq version is.
-  # @param [Sidekiq] sidekiq_config the Sidekiq config
+  # @param [Sidekiq::Config] sidekiq_config the Sidekiq config
   # @param [Hash] server_middleware_options server middleware initialization options
   # @option server_middleware_options [Fixnum] :expiration ttl for complete jobs
   def self.configure_server_middleware(sidekiq_config, server_middleware_options = {})
     sidekiq_config.server_middleware do |chain|
-      if Sidekiq.major_version < 5
-        chain.insert_after Sidekiq::Middleware::Server::Logging,
-          Sidekiq::Status::ServerMiddleware, server_middleware_options
-      else
-        chain.add Sidekiq::Status::ServerMiddleware, server_middleware_options
-      end
+      chain.add Sidekiq::Status::ServerMiddleware, server_middleware_options
     end
   end
 end

data/lib/sidekiq-status/storage.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Sidekiq::Status::Storage
-  RESERVED_FIELDS=%w(status stop update_time).freeze
+  RESERVED_FIELDS=%w(status stop enqueued_at started_at updated_at ended_at).freeze
   BATCH_LIMIT = 500
   protected
@@ -15,7 +15,7 @@ module Sidekiq::Status::Storage
     status_updates.transform_values!(&:to_s)
     redis_connection(redis_pool) do |conn|
       conn.multi do |pipeline|
-        pipeline.hset  key(id), 'update_time', Time.now.to_i, *(status_updates.to_a.flatten(1))
+        pipeline.hset  key(id), 'updated_at', Time.now.to_i, *(status_updates.to_a.flatten(1))
         pipeline.expire key(id), (expiration || Sidekiq::Status::DEFAULT_EXPIRY)
         pipeline.publish "status_updates", id
       end[0]
@@ -30,7 +30,16 @@ module Sidekiq::Status::Storage
   # @param [ConnectionPool] redis_pool optional redis connection pool
   # @return [String] Redis operation status code
   def store_status(id, status, expiration = nil, redis_pool=nil)
-    store_for_id id, {status: status}, expiration, redis_pool
+    updates = {status: status}
+    case status.to_sym
+    when :failed, :stopped, :interrupted, :complete
+      updates[:ended_at] = Time.now.to_i
+    when :working
+      updates[:started_at] = Time.now.to_i
+    when :queued
+      updates[:enqueued_at] = Time.now.to_i
+    end
+    store_for_id id, updates, expiration, redis_pool
   end
   # Unschedules the job and deletes the Status

data/lib/sidekiq-status/version.rb CHANGED Viewed

@@ -1,5 +1,5 @@
 module Sidekiq
   module Status
-    VERSION = '3.0.3'
+    VERSION = '4.0.0'
   end
 end

data/lib/sidekiq-status/web.rb CHANGED Viewed

@@ -1,14 +1,15 @@
 # adapted from https://github.com/cryo28/sidekiq_status
+require_relative 'helpers'
 module Sidekiq::Status
   # Hook into *Sidekiq::Web* Sinatra app which adds a new "/statuses" page
   module Web
-    # Location of Sidekiq::Status::Web view templates
-    VIEW_PATH = File.expand_path('../../../web/views', __FILE__)
+    # Location of Sidekiq::Status::Web static assets and templates
+    ROOT = File.expand_path("../../web", File.dirname(__FILE__))
+    VIEW_PATH = File.expand_path("views", ROOT)
     DEFAULT_PER_PAGE_OPTS = [25, 50, 100].freeze
     DEFAULT_PER_PAGE = 25
-    COMMON_STATUS_HASH_KEYS = %w(update_time jid status worker args label pct_complete total at message working_at elapsed eta)
     class << self
       def per_page_opts= arr
@@ -25,74 +26,9 @@ module Sidekiq::Status
       end
     end
-    # @param [Sidekiq::Web] app
     def self.registered(app)
-      # Allow method overrides to support RESTful deletes
-      app.set :method_override, true
-      app.helpers do
-        def csrf_tag
-          "<input type='hidden' name='authenticity_token' value='#{session[:csrf]}'/>"
-        end
-        def poll_path
-          "?#{request.query_string}" if params[:poll]
-        end
-        def sidekiq_status_template(name)
-          path = File.join(VIEW_PATH, name.to_s) + ".erb"
-          File.open(path).read
-        end
-        def add_details_to_status(status)
-          status['label'] = status_label(status['status'])
-          status["pct_complete"] ||= pct_complete(status)
-          status["elapsed"] ||= elapsed(status).to_s
-          status["eta"] ||= eta(status).to_s
-          status["custom"] = process_custom_data(status)
-          return status
-        end
-        def process_custom_data(hash)
-          hash.reject { |key, _| COMMON_STATUS_HASH_KEYS.include?(key) }
-        end
-        def pct_complete(status)
-          return 100 if status['status'] == 'complete'
-          Sidekiq::Status::pct_complete(status['jid']) || 0
-        end
-        def elapsed(status)
-          case status['status']
-          when 'complete'
-            Sidekiq::Status.update_time(status['jid']) - Sidekiq::Status.working_at(status['jid'])
-          when 'working', 'retrying'
-            Time.now.to_i - Sidekiq::Status.working_at(status['jid'])
-          end
-        end
-        def eta(status)
-          Sidekiq::Status.eta(status['jid']) if status['status'] == 'working'
-        end
-        def status_label(status)
-          case status
-          when 'complete'
-            'success'
-          when 'working', 'retrying'
-            'warning'
-          when 'queued'
-            'primary'
-          else
-            'danger'
-          end
-        end
-        def has_sort_by?(value)
-          ["worker", "status", "update_time", "pct_complete", "message", "args"].include?(value)
-        end
-      end
+      app.helpers Helpers
       app.get '/statuses' do
@@ -110,39 +46,41 @@ module Sidekiq::Status
           @statuses << status
         end
-        sort_by = has_sort_by?(params[:sort_by]) ? params[:sort_by] : "update_time"
+        sort_by = has_sort_by?(safe_url_params("sort_by")) ? safe_url_params("sort_by") : "updated_at"
         sort_dir = "asc"
-        if params[:sort_dir] == "asc"
+        if safe_url_params("sort_dir") == "asc"
           @statuses = @statuses.sort { |x,y| (x[sort_by] <=> y[sort_by]) || -1 }
         else
           sort_dir = "desc"
           @statuses = @statuses.sort { |y,x| (x[sort_by] <=> y[sort_by]) || 1 }
         end
-        if params[:status] && params[:status] != "all"
-          @statuses = @statuses.select {|job_status| job_status["status"] == params[:status] }
+        if safe_url_params("status") && safe_url_params("status") != "all"
+          @statuses = @statuses.select {|job_status| job_status["status"] == safe_url_params("status") }
         end
         # Sidekiq pagination
         @total_size = @statuses.count
-        @count = params[:per_page] ? params[:per_page].to_i : Sidekiq::Status::Web.default_per_page
-        @count = @total_size if params[:per_page] == 'all'
-        @current_page = params[:page].to_i < 1 ? 1 : params[:page].to_i
+        @count = safe_url_params("per_page") ? safe_url_params("per_page").to_i : Sidekiq::Status::Web.default_per_page
+        @count = @total_size if safe_url_params("per_page") == 'all'
+        @current_page = safe_url_params("page").to_i < 1 ? 1 : safe_url_params("page").to_i
         @statuses = @statuses.slice((@current_page - 1) * @count, @count)
         @headers = [
           {id: "worker", name: "Worker / JID", class: nil, url: nil},
           {id: "args", name: "Arguments", class: nil, url: nil},
           {id: "status", name: "Status", class: nil, url: nil},
-          {id: "update_time", name: "Last Updated", class: nil, url: nil},
+          {id: "updated_at", name: "Last Updated", class: nil, url: nil},
           {id: "pct_complete", name: "Progress", class: nil, url: nil},
           {id: "elapsed", name: "Time Elapsed", class: nil, url: nil},
           {id: "eta", name: "ETA", class: nil, url: nil},
         ]
+        args = request.params
         @headers.each do |h|
-          h[:url] = "statuses?" + params.merge("sort_by" => h[:id], "sort_dir" => (sort_by == h[:id] && sort_dir == "asc") ? "desc" : "asc").map{|k, v| "#{k}=#{CGI.escape v.to_s}"}.join("&")
+          h[:url] = "statuses?" + args.merge("sort_by" => h[:id], "sort_dir" => (sort_by == h[:id] && sort_dir == "asc") ? "desc" : "asc").map{|k, v| "#{k}=#{CGI.escape v.to_s}"}.join("&")
           h[:class] = "sorted_#{sort_dir}" if sort_by == h[:id]
         end
@@ -150,7 +88,7 @@ module Sidekiq::Status
       end
       app.get '/statuses/:jid' do
-        job = Sidekiq::Status::get_all params['jid']
+        job = Sidekiq::Status::get_all safe_route_params(:jid)
         if job.empty?
           throw :halt, [404, {"Content-Type" => "text/html"}, [erb(sidekiq_status_template(:status_not_found))]]
@@ -160,35 +98,71 @@ module Sidekiq::Status
         end
       end
+      # Handles POST requests with method override for statuses
+      app.post '/statuses' do
+        case safe_url_params("_method")
+        when 'put'
+          # Retries a failed job from the status list
+          retry_job_action
+        when 'delete'
+          # Removes a completed job from the status list
+          delete_job_action
+        else
+          throw :halt, [405, {"Content-Type" => "text/html"}, ["Method not allowed"]]
+        end
+      end
       # Retries a failed job from the status list
       app.put '/statuses' do
-        job = Sidekiq::RetrySet.new.find_job(params[:jid])
-        job ||= Sidekiq::DeadSet.new.find_job(params[:jid])
-        job.retry if job
-        throw :halt, [302, { "Location" => request.referer }, []]
+        retry_job_action
       end
       # Removes a completed job from the status list
       app.delete '/statuses' do
-        Sidekiq::Status.delete(params[:jid])
-        throw :halt, [302, { "Location" => request.referer }, []]
+        delete_job_action
       end
     end
   end
 end
 unless defined?(Sidekiq::Web)
-  require 'delegate' # Needed for sidekiq 5.x
   require 'sidekiq/web'
 end
-Sidekiq::Web.register(Sidekiq::Status::Web)
-["per_page", "sort_by", "sort_dir", "status"].each do |key|
-  Sidekiq::WebHelpers::SAFE_QPARAMS.push(key)
-end
-if Sidekiq::Web.tabs.is_a?(Array)
-  # For sidekiq < 2.5
-  Sidekiq::Web.tabs << "statuses"
+if Sidekiq.major_version >= 8
+  Sidekiq::Web.configure do |config|
+    config.register_extension(
+      Sidekiq::Status::Web,
+      name: 'statuses',
+      tab: ['Statuses'],
+      index: ['statuses'],
+      root_dir: Sidekiq::Status::Web::ROOT,
+      asset_paths: ['javascripts', 'stylesheets']
+    )
+  end
+elsif Gem::Version.new(Sidekiq::VERSION) >= Gem::Version.new('7.3.0')
+  Sidekiq::Web.configure do |config|
+    config.register(
+      Sidekiq::Status::Web,
+      name: 'statuses',
+      tab: ['Statuses'],
+      index: 'statuses'
+    )
+  end
 else
+  Sidekiq::Web.register(Sidekiq::Status::Web)
   Sidekiq::Web.tabs["Statuses"] = "statuses"
 end
+["per_page", "sort_by", "sort_dir", "status"].each do |key|
+  Sidekiq::WebHelpers::SAFE_QPARAMS.push(key)
+end
+# Register custom JavaScript and CSS assets
+ASSETS_PATH = File.expand_path('../../../web', __FILE__)
+Sidekiq::Web.use Rack::Static,
+  urls: ['/assets'],
+  root: ASSETS_PATH,
+  cascade: true,
+  header_rules: [[:all, { 'cache-control' => 'private, max-age=86400' }]]