sidekiq 6.0.1 → 6.0.6

data/lib/sidekiq/util.rb

@@ -11,8 +11,6 @@ module Sidekiq
   module Util
     include ExceptionHandler
 
-    EXPIRY = 60 * 60 * 24
-
     def watchdog(last_words)
       yield
     rescue Exception => ex

data/lib/sidekiq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "6.0.1"
+  VERSION = "6.0.6"
 end

data/lib/sidekiq/web.rb

@@ -31,7 +31,7 @@ module Sidekiq
       "Queues" => "queues",
       "Retries" => "retries",
       "Scheduled" => "scheduled",
-      "Dead" => "morgue",
+      "Dead" => "morgue"
     }
 
     class << self

data/lib/sidekiq/web/application.rb

@@ -5,7 +5,6 @@ module Sidekiq
     extend WebRouter
 
     CONTENT_LENGTH = "Content-Length"
-    CONTENT_TYPE = "Content-Type"
     REDIS_KEYS = %w[redis_version uptime_in_days connected_clients used_memory_human used_memory_peak_human]
     CSP_HEADER = [
       "default-src 'self' https: http:",
@@ -20,7 +19,7 @@ module Sidekiq
       "script-src 'self' https: http: 'unsafe-inline'",
       "style-src 'self' https: http: 'unsafe-inline'",
       "worker-src 'self'",
-      "base-uri 'self'",
+      "base-uri 'self'"
     ].join("; ").freeze
 
     def initialize(klass)
@@ -91,7 +90,15 @@ module Sidekiq
     end
 
     post "/queues/:name" do
-      Sidekiq::Queue.new(route_params[:name]).clear
+      queue = Sidekiq::Queue.new(route_params[:name])
+
+      if Sidekiq.pro? && params["pause"]
+        queue.pause!
+      elsif Sidekiq.pro? && params["unpause"]
+        queue.unpause!
+      else
+        queue.clear
+      end
 
       redirect "#{root_path}queues"
     end
@@ -268,7 +275,7 @@ module Sidekiq
           scheduled: sidekiq_stats.scheduled_size,
           retries: sidekiq_stats.retry_size,
           dead: sidekiq_stats.dead_size,
-          default_latency: sidekiq_stats.default_queue_latency,
+          default_latency: sidekiq_stats.default_queue_latency
         },
         redis: redis_stats,
         server_utc_time: server_utc_time
@@ -293,22 +300,20 @@ module Sidekiq
 
       resp = case resp
       when Array
+        # redirects go here
         resp
       else
+        # rendered content goes here
         headers = {
           "Content-Type" => "text/html",
           "Cache-Control" => "no-cache",
           "Content-Language" => action.locale,
-          "Content-Security-Policy" => CSP_HEADER,
+          "Content-Security-Policy" => CSP_HEADER
         }
-
+        # we'll let Rack calculate Content-Length for us.
         [200, headers, [resp]]
       end
 
-      resp[1] = resp[1].dup
-
-      resp[1][CONTENT_LENGTH] = resp[2].inject(0) { |l, p| l + p.bytesize }.to_s
-
       resp
     end
 

data/lib/sidekiq/web/helpers.rb

@@ -156,12 +156,6 @@ module Sidekiq
       @stats ||= Sidekiq::Stats.new
     end
 
-    def retries_with_score(score)
-      Sidekiq.redis { |conn|
-        conn.zrangebyscore("retry", score, score)
-      }.map { |msg| Sidekiq.load_json(msg) }
-    end
-
     def redis_connection
       Sidekiq.redis do |conn|
         c = conn.connection
@@ -301,7 +295,7 @@ module Sidekiq
     end
 
     def environment_title_prefix
-      environment = Sidekiq.options[:environment] || ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
+      environment = Sidekiq.options[:environment] || ENV["APP_ENV"] || ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
 
       "[#{environment.upcase}] " unless environment == "production"
     end

data/lib/sidekiq/web/router.rb

@@ -94,9 +94,7 @@ module Sidekiq
         {} if path == matcher
       else
         path_match = path.match(matcher)
-        if path_match
-          Hash[path_match.names.map(&:to_sym).zip(path_match.captures)]
-        end
+        path_match&.named_captures&.transform_keys(&:to_sym)
       end
     end
   end

data/lib/sidekiq/worker.rb

@@ -48,8 +48,8 @@ module Sidekiq
         # In practice, any option is allowed.  This is the main mechanism to configure the
         # options for a specific job.
         def sidekiq_options(opts = {})
-          opts = Hash[opts.map { |k, v| [k.to_s, v] }] # stringify
-          self.sidekiq_options_hash = get_sidekiq_options.merge(Hash[opts.map { |k, v| [k.to_s, v] }])
+          opts = opts.transform_keys(&:to_s) # stringify
+          self.sidekiq_options_hash = get_sidekiq_options.merge(opts)
         end
 
         def sidekiq_retry_in(&block)

data/sidekiq.gemspec

@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency "redis", ">= 4.1.0"
   gem.add_dependency "connection_pool", ">= 2.2.2"
-  gem.add_dependency "rack", ">= 2.0.0"
+  gem.add_dependency "rack", "~> 2.0"
   gem.add_dependency "rack-protection", ">= 2.0.0"
 end

data/web/assets/javascripts/application.js

@@ -19,7 +19,8 @@ Sidekiq = {};
 $(function() {
   var pollpath = $('body').data('poll-path');
   if (pollpath != "") {
-    updatePage(pollpath);
+    var ti = parseInt(localStorage.timeInterval) || 2000;
+    setTimeout(function(){updatePage(pollpath)}, ti);
   }
 
   $(document).on('click', '.check_all', function() {
@@ -55,26 +56,28 @@ function updateFuzzyTimes(locale) {
 }
 
 function updatePage(url) {
-  setInterval(function () {
-    $.ajax({
-      url: url,
-      dataType: 'html'
-    }).done(function (data) {
-      $data = $(data)
-
-      var $page = $data.filter('#page')
-      $('#page').replaceWith($page)
-
-      var $header_status = $data.find('.status')
-      $('.status').replaceWith($header_status)
-
-      updateFuzzyTimes($('body').data('locale'));
-    })
-  }, parseInt(localStorage.timeInterval) || 2000);
+  $.ajax({
+    url: url,
+    dataType: 'html'
+  }).done(function(data) {
+    $data = $(data)
+
+    var $page = $data.filter('#page')
+    $('#page').replaceWith($page)
+
+    var $header_status = $data.find('.status')
+    $('.status').replaceWith($header_status)
+
+    updateFuzzyTimes($('body').data('locale'));
+
+    var ti = parseInt(localStorage.timeInterval) || 2000;
+    setTimeout(function(){updatePage(url)}, ti)
+  }).fail(function() {
+    var ti = parseInt(localStorage.timeInterval) || 2000;
+    setTimeout(function(){updatePage(url)}, ti)
+  })
 }
 
-
-
 $(function() {
   'use strict';
 

data/web/assets/stylesheets/application-dark.css

@@ -1,125 +1,122 @@
-@media (prefers-color-scheme: dark) {
-
-  body {
-    background-color: #000;
-    color: #ccc;
-  }
-
-  a,
-  .title,
-  .summary_bar ul .count,
-  .navbar .navbar-brand {
-    color: #af0014;
-  }
-
-  .navbar .navbar-brand:hover {
-    color: #ccc;
-  }
-
-  .navbar .navbar-brand .status {
-    color: #ccc;
-  }
-
-  .navbar-inverse {
-    background-color: #000;
-    border-color: #333;
-  }
-
-  table.table-white {
-    background-color: #111;
-  }
-
-  .table-striped > tbody > tr:nth-of-type(odd) {
-    background-color: #222;
-  }
-
-  .table-bordered,
-  .table-bordered > tbody > tr > td,
-  .table-bordered > tbody > tr > th,
-  .table-bordered > tfoot > tr > td,
-  .table-bordered > tfoot > tr > th,
-  .table-bordered > thead > tr > td,
-  .table-bordered > thead > tr > th {
-    border: 1px solid #333;
-  }
-
-  .table-hover > tbody > tr:hover {
-    background-color: #333;
-  }
-
-  .alert {
-    border: none;
-    color: #ccc;
-  }
-
-  .alert-success {
-    background-color: #000;
-  }
-
-  a:link,
-  a:active,
-  a:hover,
-  a:visited {
-    color: #63798c;
-  }
-
-  a.btn {
-    color: #000;
-  }
-
-  .summary_bar .summary {
-    background-color: #000;
-    border: 1px solid #333;
-  }
-
-  .navbar-default {
-    background-color: #000;
-    border-color: #3d3d3d;
-  }
-
-  .navbar-default .navbar-nav > .active > a,
-  .navbar-default .navbar-nav > .active > a:focus,
-  .navbar-default .navbar-nav > .active > a:hover {
-    color: #ccc;
-    background-color: #282828;
-  }
-
-  .navbar-default .navbar-nav > li > a:hover {
-    color: #ccc;
-  }
-
-  .pagination > li > a,
-  .pagination > li > a:hover,
-  .pagination > li > span {
-    color: #ccc;
-    background-color: #282828;
-    border-color: #353535;
-  }
-  .pagination > .disabled > a,
-  .pagination > .disabled > a:focus,
-  .pagination > .disabled > a:hover,
-  .pagination > .disabled > span,
-  .pagination > .disabled > span:focus,
-  .pagination > .disabled > span:hover {
-    color: #a5a5a5;
-    background-color: #282828;
-    border-color: #353535;
-  }
-
-  .stat {
-    border: 1px solid rgba(255, 255, 255, 0.1);
-  }
-
-  #live-poll {
-    color: #ccc;
-  }
-
-  .btn-warn {
-    color: #333;
-  }
-
-  .rickshaw_graph .y_ticks.glow text {
-    fill: #ccc;
-    color: #ccc;
-  }
+body {
+  background-color: #000;
+  color: #ccc;
+}
+
+a,
+.title,
+.summary_bar ul .count,
+.navbar .navbar-brand {
+  color: #af0014;
+}
+
+.navbar .navbar-brand:hover {
+  color: #ccc;
+}
+
+.navbar .navbar-brand .status {
+  color: #ccc;
+}
+
+.navbar-inverse {
+  background-color: #000;
+  border-color: #333;
+}
+
+table.table-white {
+  background-color: #111;
+}
+
+.table-striped > tbody > tr:nth-of-type(odd) {
+  background-color: #222;
+}
+
+.table-bordered,
+.table-bordered > tbody > tr > td,
+.table-bordered > tbody > tr > th,
+.table-bordered > tfoot > tr > td,
+.table-bordered > tfoot > tr > th,
+.table-bordered > thead > tr > td,
+.table-bordered > thead > tr > th {
+  border: 1px solid #333;
+}
+
+.table-hover > tbody > tr:hover {
+  background-color: #333;
+}
+
+.alert {
+  border: none;
+  color: #ccc;
+}
+
+.alert-success {
+  background-color: #000;
+}
+
+a:link,
+a:active,
+a:hover,
+a:visited {
+  color: #63798c;
+}
+
+a.btn {
+  color: #000;
+}
+
+.summary_bar .summary {
+  background-color: #000;
+  border: 1px solid #333;
+}
+
+.navbar-default {
+  background-color: #000;
+  border-color: #3d3d3d;
+}
+
+.navbar-default .navbar-nav > .active > a,
+.navbar-default .navbar-nav > .active > a:focus,
+.navbar-default .navbar-nav > .active > a:hover {
+  color: #ccc;
+  background-color: #282828;
+}
+
+.navbar-default .navbar-nav > li > a:hover {
+  color: #ccc;
+}
+
+.pagination > li > a,
+.pagination > li > a:hover,
+.pagination > li > span {
+  color: #ccc;
+  background-color: #282828;
+  border-color: #353535;
+}
+.pagination > .disabled > a,
+.pagination > .disabled > a:focus,
+.pagination > .disabled > a:hover,
+.pagination > .disabled > span,
+.pagination > .disabled > span:focus,
+.pagination > .disabled > span:hover {
+  color: #a5a5a5;
+  background-color: #282828;
+  border-color: #353535;
+}
+
+.stat {
+  border: 1px solid rgba(255, 255, 255, 0.1);
+}
+
+#live-poll {
+  color: #ccc;
+}
+
+.btn-warn {
+  color: #333;
+}
+
+.rickshaw_graph .y_ticks.glow text {
+  fill: #ccc;
+  color: #ccc;
 }