sidekiq 6.0.0 → 6.0.1

data/lib/sidekiq/paginator.rb

@@ -12,10 +12,10 @@ module Sidekiq
 
       Sidekiq.redis do |conn|
         type = conn.type(key)
+        rev = opts && opts[:reverse]
 
         case type
         when "zset"
-          rev = opts && opts[:reverse]
           total_size, items = conn.multi {
             conn.zcard(key)
             if rev
@@ -28,8 +28,13 @@ module Sidekiq
         when "list"
           total_size, items = conn.multi {
             conn.llen(key)
-            conn.lrange(key, starting, ending)
+            if rev
+              conn.lrange(key, -ending - 1, -starting - 1)
+            else
+              conn.lrange(key, starting, ending)
+            end
           }
+          items.reverse! if rev
           [current_page, total_size, items]
         when "none"
           [1, 0, []]

data/lib/sidekiq/processor.rb

@@ -115,9 +115,9 @@ module Sidekiq
       # since middleware can mutate the job hash
       # we clone here so we report the original
       # job structure to the Web UI
-      pristine = cloned(job_hash)
+      pristine = json_clone(job_hash)
 
-      @job_logger.with_job_hash_context(job_hash) do
+      @job_logger.prepare(job_hash) do
         @retrier.global(pristine, queue) do
           @job_logger.call(job_hash, queue) do
             stats(pristine, queue) do
@@ -158,7 +158,7 @@ module Sidekiq
       begin
         dispatch(job_hash, queue) do |worker|
           Sidekiq.server_middleware.invoke(worker, job_hash, queue) do
-            execute_job(worker, cloned(job_hash["args"]))
+            execute_job(worker, job_hash["args"])
           end
         end
         ack = true
@@ -261,22 +261,42 @@ module Sidekiq
       end
     end
 
-    # Deep clone the arguments passed to the worker so that if
-    # the job fails, what is pushed back onto Redis hasn't
-    # been mutated by the worker.
-    def cloned(thing)
-      Marshal.load(Marshal.dump(thing))
-    end
-
     def constantize(str)
+      return Object.const_get(str) unless str.include?("::")
+
       names = str.split("::")
       names.shift if names.empty? || names.first.empty?
 
       names.inject(Object) do |constant, name|
         # the false flag limits search for name to under the constant namespace
         #   which mimics Rails' behaviour
-        constant.const_defined?(name, false) ? constant.const_get(name, false) : constant.const_missing(name)
+        constant.const_get(name, false)
+      end
+    end
+
+    # Deep clone the arguments passed to the worker so that if
+    # the job fails, what is pushed back onto Redis hasn't
+    # been mutated by the worker.
+    def json_clone(obj)
+      if Integer === obj || Float === obj || TrueClass === obj || FalseClass === obj || NilClass === obj
+        return obj
+      elsif String === obj
+        return obj.dup
+      elsif Array === obj
+        duped = Array.new(obj.size)
+        obj.each_with_index do |value, index|
+          duped[index] = json_clone(value)
+        end
+      elsif Hash === obj
+        duped = obj.dup
+        duped.each_pair do |key, value|
+          duped[key] = json_clone(value)
+        end
+      else
+        duped = obj.dup
       end
+
+      duped
     end
   end
 end

data/lib/sidekiq/scheduled.rb

@@ -14,18 +14,19 @@ module Sidekiq
         # Just check Redis for the set of jobs with a timestamp before now.
         Sidekiq.redis do |conn|
           sorted_sets.each do |sorted_set|
-            # Get the next item in the queue if it's score (time to execute) is <= now.
-            # We need to go through the list one at a time to reduce the risk of something
-            # going wrong between the time jobs are popped from the scheduled queue and when
-            # they are pushed onto a work queue and losing the jobs.
-            while (job = conn.zrangebyscore(sorted_set, "-inf", now, limit: [0, 1]).first)
-
-              # Pop item off the queue and add it to the work queue. If the job can't be popped from
-              # the queue, it's because another process already popped it so we can move on to the
-              # next one.
-              if conn.zrem(sorted_set, job)
-                Sidekiq::Client.push(Sidekiq.load_json(job))
-                Sidekiq.logger.debug { "enqueued #{sorted_set}: #{job}" }
+            # Get next items in the queue with scores (time to execute) <= now.
+            until (jobs = conn.zrangebyscore(sorted_set, "-inf", now, limit: [0, 100])).empty?
+              # We need to go through the list one at a time to reduce the risk of something
+              # going wrong between the time jobs are popped from the scheduled queue and when
+              # they are pushed onto a work queue and losing the jobs.
+              jobs.each do |job|
+                # Pop item off the queue and add it to the work queue. If the job can't be popped from
+                # the queue, it's because another process already popped it so we can move on to the
+                # next one.
+                if conn.zrem(sorted_set, job)
+                  Sidekiq::Client.push(Sidekiq.load_json(job))
+                  Sidekiq.logger.debug { "enqueued #{sorted_set}: #{job}" }
+                end
               end
             end
           end

data/lib/sidekiq/testing.rb

@@ -323,6 +323,18 @@ module Sidekiq
       end
     end
   end
+
+  module TestingExtensions
+    def jobs_for(klass)
+      jobs.select do |job|
+        marshalled = job["args"][0]
+        marshalled.index(klass.to_s) && YAML.load(marshalled)[0] == klass
+      end
+    end
+  end
+
+  Sidekiq::Extensions::DelayedMailer.extend(TestingExtensions) if defined?(Sidekiq::Extensions::DelayedMailer)
+  Sidekiq::Extensions::DelayedModel.extend(TestingExtensions) if defined?(Sidekiq::Extensions::DelayedModel)
 end
 
 if defined?(::Rails) && Rails.respond_to?(:env) && !Rails.env.test?

data/lib/sidekiq/version.rb

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

data/lib/sidekiq/web/application.rb

@@ -84,7 +84,7 @@ module Sidekiq
 
       @count = (params["count"] || 25).to_i
       @queue = Sidekiq::Queue.new(@name)
-      (@current_page, @total_size, @messages) = page("queue:#{@name}", params["page"], @count)
+      (@current_page, @total_size, @messages) = page("queue:#{@name}", params["page"], @count, reverse: params["direction"] == "asc")
       @messages = @messages.map { |msg| Sidekiq::Job.new(msg, @name) }
 
       erb(:queue)
@@ -283,17 +283,13 @@ module Sidekiq
       action = self.class.match(env)
       return [404, {"Content-Type" => "text/plain", "X-Cascade" => "pass"}, ["Not Found"]] unless action
 
-      resp = catch(:halt) {
-        app = @klass
+      app = @klass
+      resp = catch(:halt) do # rubocop:disable Standard/SemanticBlocks
         self.class.run_befores(app, action)
-        begin
-          resp = action.instance_exec env, &action.block
-        ensure
-          self.class.run_afters(app, action)
-        end
-
-        resp
-      }
+        action.instance_exec env, &action.block
+      ensure
+        self.class.run_afters(app, action)
+      end
 
       resp = case resp
       when Array

data/lib/sidekiq/web/helpers.rb

@@ -65,7 +65,10 @@ module Sidekiq
 
     def poll_path
       if current_path != "" && params["poll"]
-        root_path + current_path
+        path = root_path + current_path
+        query_string = to_query_string(params.slice(*params.keys - %w[page poll]))
+        path += "?#{query_string}" unless query_string.empty?
+        path
       else
         ""
       end
@@ -112,6 +115,13 @@ module Sidekiq
       end
     end
 
+    # within is used by Sidekiq Pro
+    def display_tags(job, within = nil)
+      job.tags.map { |tag|
+        "<span class='jobtag label label-info'>#{::Rack::Utils.escape_html(tag)}</span>"
+      }.join(" ")
+    end
+
     # mperham/sidekiq#3243
     def unfiltered?
       yield unless env["PATH_INFO"].start_with?("/filter/")
@@ -130,6 +140,10 @@ module Sidekiq
       end
     end
 
+    def sort_direction_label
+      params[:direction] == "asc" ? "&uarr;" : "&darr;"
+    end
+
     def workers
       @workers ||= Sidekiq::Workers.new
     end
@@ -189,7 +203,7 @@ module Sidekiq
       [score.to_f, jid]
     end
 
-    SAFE_QPARAMS = %w[page poll]
+    SAFE_QPARAMS = %w[page poll direction]
 
     # Merge options with current params, filter safe params, and stringify to query string
     def qparams(options)
@@ -198,7 +212,11 @@ module Sidekiq
         options[key.to_s] = options.delete(key)
       end
 
-      params.merge(options).map { |key, value|
+      to_query_string(params.merge(options))
+    end
+
+    def to_query_string(params)
+      params.map { |key, value|
         SAFE_QPARAMS.include?(key) ? "#{key}=#{CGI.escape(value.to_s)}" : next
       }.compact.join("&")
     end
@@ -238,7 +256,7 @@ module Sidekiq
       queue class args retry_count retried_at failed_at
       jid error_message error_class backtrace
       error_backtrace enqueued_at retry wrapped
-      created_at
+      created_at tags
     ])
 
     def retry_extra_items(retry_job)

data/lib/sidekiq/worker.rb

@@ -171,9 +171,9 @@ module Sidekiq
         now = Time.now.to_f
         ts = (int < 1_000_000_000 ? now + int : int)
 
-        payload = @opts.merge("class" => @klass, "args" => args, "at" => ts)
+        payload = @opts.merge("class" => @klass, "args" => args)
         # Optimization to enqueue something now that is scheduled to go out now or in the past
-        payload.delete("at") if ts <= now
+        payload["at"] = ts if ts > now
         @klass.client_push(payload)
       end
       alias_method :perform_at, :perform_in
@@ -207,10 +207,10 @@ module Sidekiq
         now = Time.now.to_f
         ts = (int < 1_000_000_000 ? now + int : int)
 
-        item = {"class" => self, "args" => args, "at" => ts}
+        item = {"class" => self, "args" => args}
 
         # Optimization to enqueue something now that is scheduled to go out now or in the past
-        item.delete("at") if ts <= now
+        item["at"] = ts if ts > now
 
         client_push(item)
       end

data/sidekiq.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |gem|
   gem.homepage = "http://sidekiq.org"
   gem.license = "LGPL-3.0"
 
-  gem.executables = ["sidekiq"]
+  gem.executables = ["sidekiq", "sidekiqmon"]
   gem.files = `git ls-files | grep -Ev '^(test|myapp|examples)'`.split("\n")
   gem.name = "sidekiq"
   gem.version = Sidekiq::VERSION

data/web/assets/javascripts/dashboard.js

@@ -27,7 +27,7 @@ var realtimeGraph = function(updatePath) {
     renderer: 'line',
     interpolation: 'linear',
 
-    series: new Rickshaw.Series.FixedDuration([{ name: graphElement.dataset.failedLabel, color: '#B1003E' }, { name: graphElement.dataset.processedLabel, color: '#006f68' }], undefined, {
+    series: new Rickshaw.Series.FixedDuration([{ name: graphElement.dataset.failedLabel, color: '#af0014' }, { name: graphElement.dataset.processedLabel, color: '#006f68' }], undefined, {
       timeInterval: timeInterval,
       maxDataPoints: 100,
     })
@@ -125,7 +125,7 @@ var historyGraph = function() {
     interpolation: 'linear',
     series: [
       {
-        color: "#B1003E",
+        color: "#af0014",
         data: failed,
         name: graphElement.dataset.failedLabel
       }, {

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

@@ -0,0 +1,125 @@
+@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;
+  }
+}

data/web/assets/stylesheets/application.css

@@ -201,6 +201,15 @@ td form {
   padding: 0;
 }
 
+.jobtag a {
+  color: white;
+}
+
+.jobtag a:hover {
+  color: white;
+  text-decoration: underline;
+}
+
 table .table-checkbox label {
   height: 100%;
   width: 100%;