sidekiq 6.0.5 → 6.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 624626b031eb97839cbef07f74a9e94dee930ef51fb1d471b566be9643b76449
-  data.tar.gz: 8364d826b034685cbcdb3d46188d88b95add713ec1d3f99998b071aebfe63078
+  metadata.gz: 3dd5d7a0dd8a7d877484df4ae3b9988f15e9cc4bc0bb4da23224be0049fa733e
+  data.tar.gz: e2b7ddb4c045817837e996356851648bf32108b37fa1abcfb72795a185b4a238
 SHA512:
-  metadata.gz: 7375504648039835a884591e972e87c2e3ce2d0a522e6d40c5c2ead886558866f724a5695276214046c1f08a1ad1e19fc65d07670e098aeb126e76b37621b9a5
-  data.tar.gz: c5af7245e5eee8ad3f0a714306e00e781b770f2ca31afeb6418e8fdd65ac9864bd7dc6fa76880449aa1e3f05623ee60a1d7de266ad06c303ca1e4d96b1f1a52b
+  metadata.gz: 5ce3f911b835b38ce212309bcdf81b4789e24a12898a0f2071b9adb9cbcdfa23a33bb7216c2f7c6dcab26d484f79a1271594d3218f63ed041f0027deab5a26f3
+  data.tar.gz: 685a6890a43c990b2fd9709c49f9c82c96a487cdcf6fc0607ab15b9dbb47d52c9f797ec5094d3f92ec35c5737e661f966a6b81006ee4b7d99a7f31285180b3db

data/.circleci/config.yml

@@ -58,4 +58,3 @@ workflows:
     jobs:
       - "ruby-2.5"
       - "ruby-2.6"
-      - "jruby"

data/Changes.md

@@ -2,12 +2,33 @@
 
 [Sidekiq Changes](https://github.com/mperham/sidekiq/blob/master/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/master/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/master/Ent-Changes.md)
 
+6.0.7
+---------
+
+- Refactor systemd integration to work better with custom binaries [#4511]
+- Don't connect to Redis at process exit if not needed [#4502]
+- Remove Redis connection naming [#4479]
+- Fix Redis Sentinel password redaction [#4499]
+- Add Vietnamese locale (vi) [#4528]
+
+6.0.6
+---------
+
+- **Integrate with systemd's watchdog and notification features** [#4488]
+  Set `Type=notify` in [sidekiq.service](https://github.com/mperham/sidekiq/blob/4b8a8bd3ae42f6e48ae1fdaf95ed7d7af18ed8bb/examples/systemd/sidekiq.service#L30-L39). The integration works automatically.
+- Use `setTimeout` rather than `setInterval` to avoid thundering herd [#4480]
+- Fix edge case where a job can be pushed without a queue.
+- Flush job stats at exit [#4498]
+- Check RAILS_ENV before RACK_ENV [#4493]
+- Add Lithuanian locale [#4476]
+
 6.0.5
 ---------
 
 - Fix broken Web UI response when using NewRelic and Rack 2.1.2+. [#4440]
 - Update APIs to use `UNLINK`, not `DEL`. [#4449]
 - Fix Ruby 2.7 warnings [#4412]
+- Add support for `APP_ENV` [[95fa5d9]](https://github.com/mperham/sidekiq/commit/95fa5d90192148026e52ca2902f1b83c70858ce8)
 
 6.0.4
 ---------

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sidekiq (6.0.5)
+    sidekiq (6.0.7)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
       rack-protection (>= 2.0.0)
@@ -106,7 +106,7 @@ GEM
       mini_portile2 (~> 2.4.0)
     nokogiri (1.10.8-java)
     parallel (1.19.1)
-    parser (2.7.0.2)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -150,10 +150,10 @@ GEM
     redis (4.1.3)
     redis-namespace (1.7.0)
       redis (>= 3.0.4)
-    rubocop (0.77.0)
+    rubocop (0.79.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
@@ -172,8 +172,8 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    standard (0.1.7)
-      rubocop (~> 0.77.0)
+    standard (0.2.1)
+      rubocop (~> 0.79.0)
       rubocop-performance (~> 1.5.1)
     thor (1.0.1)
     thread_safe (0.3.6)

data/Pro-Changes.md

@@ -2,7 +2,13 @@
 
 [Sidekiq Changes](https://github.com/mperham/sidekiq/blob/master/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/master/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/master/Ent-Changes.md)
 
-Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
+Please see [http://sidekiq.org](http://sidekiq.org) for more details and how to buy.
+
+HEAD
+---------
+
+- Update `constantize` for batch callbacks. [#4469]
+
 
 5.0.1
 ---------

data/bin/sidekiq

@@ -6,9 +6,28 @@ $TESTING = false
 
 require_relative '../lib/sidekiq/cli'
 
+def integrate_with_systemd
+  return unless ENV["NOTIFY_SOCKET"]
+
+  Sidekiq.configure_server do |config|
+    Sidekiq.logger.info "Enabling systemd notification integration"
+    require "sidekiq/sd_notify"
+    config.on(:startup) do
+      Sidekiq::SdNotify.ready
+    end
+    config.on(:shutdown) do
+      Sidekiq::SdNotify.stopping
+    end
+    Sidekiq.start_watchdog if Sidekiq::SdNotify.watchdog?
+  end
+end
+
 begin
   cli = Sidekiq::CLI.instance
   cli.parse
+
+  integrate_with_systemd
+
   cli.run
 rescue => e
   raise e if $DEBUG

data/lib/sidekiq.rb

@@ -30,16 +30,16 @@ module Sidekiq
       startup: [],
       quiet: [],
       shutdown: [],
-      heartbeat: [],
+      heartbeat: []
     },
     dead_max_jobs: 10_000,
     dead_timeout_in_seconds: 180 * 24 * 60 * 60, # 6 months
-    reloader: proc { |&block| block.call },
+    reloader: proc { |&block| block.call }
   }
 
   DEFAULT_WORKER_OPTIONS = {
     "retry" => true,
-    "queue" => "default",
+    "queue" => "default"
   }
 
   FAKE_INFO = {
@@ -47,7 +47,7 @@ module Sidekiq
     "uptime_in_days" => "9999",
     "connected_clients" => "9999",
     "used_memory_human" => "9P",
-    "used_memory_peak_human" => "9P",
+    "used_memory_peak_human" => "9P"
   }
 
   def self.❨╯°□°❩╯︵┻━┻
@@ -154,7 +154,7 @@ module Sidekiq
 
   def self.default_worker_options=(hash)
     # stringify
-    @default_worker_options = default_worker_options.merge(Hash[hash.map { |k, v| [k.to_s, v] }])
+    @default_worker_options = default_worker_options.merge(hash.transform_keys(&:to_s))
   end
 
   def self.default_worker_options

data/lib/sidekiq/api.rb

@@ -105,7 +105,7 @@ module Sidekiq
 
         default_queue_latency: default_queue_latency,
         workers_size: workers_size,
-        enqueued: enqueued,
+        enqueued: enqueued
       }
     end
 

data/lib/sidekiq/cli.rb

@@ -54,7 +54,7 @@ module Sidekiq
 
       logger.info "Running in #{RUBY_DESCRIPTION}"
       logger.info Sidekiq::LICENSE
-      logger.info "Upgrade to Sidekiq Pro for more features and support: http://sidekiq.org" unless defined?(::Sidekiq::Pro)
+      logger.info "Upgrade to Sidekiq Pro for more features and support: https://sidekiq.org" unless defined?(::Sidekiq::Pro)
 
       # touch the connection pool so it is created before we
       # fire startup and start multithreading.
@@ -163,7 +163,7 @@ module Sidekiq
             Sidekiq.logger.warn "<no backtrace available>"
           end
         end
-      },
+      }
     }
     UNHANDLED_SIGNAL_HANDLER = ->(cli) { Sidekiq.logger.info "No signal handler registered, ignoring" }
     SIGNAL_HANDLERS.default = UNHANDLED_SIGNAL_HANDLER
@@ -185,8 +185,8 @@ module Sidekiq
       # See #984 for discussion.
       # APP_ENV is now the preferred ENV term since it is not tech-specific.
       # Both Sinatra 2.0+ and Sidekiq support this term.
-      # RACK_ENV and RAILS_ENV are there for legacy support.
-      @environment = cli_env || ENV["APP_ENV"] || ENV["RACK_ENV"] || ENV["RAILS_ENV"] || "development"
+      # RAILS_ENV and RACK_ENV are there for legacy support.
+      @environment = cli_env || ENV["APP_ENV"] || ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
     end
 
     def symbolize_keys_deep!(hash)
@@ -389,3 +389,5 @@ module Sidekiq
     end
   end
 end
+
+require "sidekiq/systemd"

data/lib/sidekiq/client.rb

@@ -236,6 +236,8 @@ module Sidekiq
       defaults = defaults.merge(item["wrapped"].get_sidekiq_options) if item["wrapped"].respond_to?("get_sidekiq_options")
       item = defaults.merge(item)
 
+      raise(ArgumentError, "Job must include a valid queue name") if item["queue"].nil? || item["queue"] == ""
+
       item["class"] = item["class"].to_s
       item["queue"] = item["queue"].to_s
       item["jid"] ||= SecureRandom.hex(12)

data/lib/sidekiq/job_logger.rb

@@ -39,7 +39,7 @@ module Sidekiq
       # attribute to expose the underlying thing.
       h = {
         class: job_hash["wrapped"] || job_hash["class"],
-        jid: job_hash["jid"],
+        jid: job_hash["jid"]
       }
       h[:bid] = job_hash["bid"] if job_hash["bid"]
       h[:tags] = job_hash["tags"] if job_hash["tags"]

data/lib/sidekiq/launcher.rb

@@ -16,7 +16,7 @@ module Sidekiq
       proc { Sidekiq::VERSION },
       proc { |me, data| data["tag"] },
       proc { |me, data| "[#{Processor::WORKER_STATE.size} of #{data["concurrency"]} busy]" },
-      proc { |me, data| "stopping" if me.stopping? },
+      proc { |me, data| "stopping" if me.stopping? }
     ]
 
     attr_accessor :manager, :poller, :fetcher
@@ -96,6 +96,32 @@ module Sidekiq
       ❤
     end
 
+    def self.flush_stats
+      fails = Processor::FAILURE.reset
+      procd = Processor::PROCESSED.reset
+      return if fails + procd == 0
+
+      nowdate = Time.now.utc.strftime("%Y-%m-%d")
+      begin
+        Sidekiq.redis do |conn|
+          conn.pipelined do
+            conn.incrby("stat:processed", procd)
+            conn.incrby("stat:processed:#{nowdate}", procd)
+            conn.expire("stat:processed:#{nowdate}", STATS_TTL)
+
+            conn.incrby("stat:failed", fails)
+            conn.incrby("stat:failed:#{nowdate}", fails)
+            conn.expire("stat:failed:#{nowdate}", STATS_TTL)
+          end
+        end
+      rescue => ex
+        # we're exiting the process, things might be shut down so don't
+        # try to handle the exception
+        Sidekiq.logger.warn("Unable to flush stats: #{ex}")
+      end
+    end
+    at_exit(&method(:flush_stats))
+
     def ❤
       key = identity
       fails = procd = 0
@@ -146,7 +172,7 @@ module Sidekiq
         ::Process.kill(msg, ::Process.pid)
       rescue => e
         # ignore all redis/network issues
-        logger.error("heartbeat: #{e.message}")
+        logger.error("heartbeat: #{e}")
         # don't lose the counts if there was a network issue
         Processor::PROCESSED.incr(procd)
         Processor::FAILURE.incr(fails)
@@ -163,7 +189,7 @@ module Sidekiq
           "concurrency" => @options[:concurrency],
           "queues" => @options[:queues].uniq,
           "labels" => @options[:labels],
-          "identity" => identity,
+          "identity" => identity
         }
       end
     end

data/lib/sidekiq/logger.rb

@@ -23,7 +23,7 @@ module Sidekiq
       "info" => 1,
       "warn" => 2,
       "error" => 3,
-      "fatal" => 4,
+      "fatal" => 4
     }
     LEVELS.default_proc = proc do |_, level|
       Sidekiq.logger.warn("Invalid log level: #{level.inspect}")
@@ -31,23 +31,23 @@ module Sidekiq
     end
 
     def debug?
-      level >= 0
+      level <= 0
     end
 
     def info?
-      level >= 1
+      level <= 1
     end
 
     def warn?
-      level >= 2
+      level <= 2
     end
 
     def error?
-      level >= 3
+      level <= 3
     end
 
     def fatal?
-      level >= 4
+      level <= 4
     end
 
     def local_level
@@ -152,7 +152,7 @@ module Sidekiq
             pid: ::Process.pid,
             tid: tid,
             lvl: severity,
-            msg: message,
+            msg: message
           }
           c = ctx
           hash["ctx"] = c unless c.empty?

data/lib/sidekiq/monitor.rb

@@ -62,7 +62,7 @@ class Sidekiq::Monitor
       columns = {
         name: [:ljust, (["name"] + queue_data.map(&:name)).map(&:length).max + COL_PAD],
         size: [:rjust, (["size"] + queue_data.map(&:size)).map(&:length).max + COL_PAD],
-        latency: [:rjust, (["latency"] + queue_data.map(&:latency)).map(&:length).max + COL_PAD],
+        latency: [:rjust, (["latency"] + queue_data.map(&:latency)).map(&:length).max + COL_PAD]
       }
       columns.each { |col, (dir, width)| print col.to_s.upcase.public_send(dir, width) }
       puts
@@ -101,7 +101,7 @@ class Sidekiq::Monitor
       tags = [
         process["tag"],
         process["labels"],
-        (process["quiet"] == "true" ? "quiet" : nil),
+        (process["quiet"] == "true" ? "quiet" : nil)
       ].flatten.compact
       tags.any? ? "[#{tags.join("] [")}]" : nil
     end

data/lib/sidekiq/redis_connection.rb

@@ -12,8 +12,9 @@ module Sidekiq
           options[key.to_sym] = options.delete(key)
         end
 
-        options[:id] = "Sidekiq-#{Sidekiq.server? ? "server" : "client"}-PID-#{::Process.pid}" unless options.key?(:id)
-        options[:url] ||= determine_redis_provider
+        if !options[:url] && (u = determine_redis_provider)
+          options[:url] = u
+        end
 
         size = if options[:size]
           options[:size]
@@ -93,9 +94,10 @@ module Sidekiq
       end
 
       def log_info(options)
-        # Don't log Redis AUTH password
         redacted = "REDACTED"
-        scrubbed_options = options.dup
+
+        # deep clone so we can muck with these options all we want
+        scrubbed_options = Marshal.load(Marshal.dump(options))
         if scrubbed_options[:url] && (uri = URI.parse(scrubbed_options[:url])) && uri.password
           uri.password = redacted
           scrubbed_options[:url] = uri.to_s

data/lib/sidekiq/sd_notify.rb

@@ -0,0 +1,149 @@
+# frozen_string_literal: true
+
+# The MIT License
+#
+# Copyright (c) 2017, 2018, 2019, 2020 Agis Anastasopoulos
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+# the Software, and to permit persons to whom the Software is furnished to do so,
+# subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# This is a copy of https://github.com/agis/ruby-sdnotify as of commit a7d52ee
+# The only changes made was "rehoming" it within the Sidekiq module to avoid
+# namespace collisions and applying standard's code formatting style.
+
+require "socket"
+
+# SdNotify is a pure-Ruby implementation of sd_notify(3). It can be used to
+# notify systemd about state changes. Methods of this package are no-op on
+# non-systemd systems (eg. Darwin).
+#
+# The API maps closely to the original implementation of sd_notify(3),
+# therefore be sure to check the official man pages prior to using SdNotify.
+#
+# @see https://www.freedesktop.org/software/systemd/man/sd_notify.html
+module Sidekiq
+  module SdNotify
+    # Exception raised when there's an error writing to the notification socket
+    class NotifyError < RuntimeError; end
+
+    READY = "READY=1"
+    RELOADING = "RELOADING=1"
+    STOPPING = "STOPPING=1"
+    STATUS = "STATUS="
+    ERRNO = "ERRNO="
+    MAINPID = "MAINPID="
+    WATCHDOG = "WATCHDOG=1"
+    FDSTORE = "FDSTORE=1"
+
+    def self.ready(unset_env = false)
+      notify(READY, unset_env)
+    end
+
+    def self.reloading(unset_env = false)
+      notify(RELOADING, unset_env)
+    end
+
+    def self.stopping(unset_env = false)
+      notify(STOPPING, unset_env)
+    end
+
+    # @param status [String] a custom status string that describes the current
+    #   state of the service
+    def self.status(status, unset_env = false)
+      notify("#{STATUS}#{status}", unset_env)
+    end
+
+    # @param errno [Integer]
+    def self.errno(errno, unset_env = false)
+      notify("#{ERRNO}#{errno}", unset_env)
+    end
+
+    # @param pid [Integer]
+    def self.mainpid(pid, unset_env = false)
+      notify("#{MAINPID}#{pid}", unset_env)
+    end
+
+    def self.watchdog(unset_env = false)
+      notify(WATCHDOG, unset_env)
+    end
+
+    def self.fdstore(unset_env = false)
+      notify(FDSTORE, unset_env)
+    end
+
+    # @param [Boolean] true if the service manager expects watchdog keep-alive
+    #   notification messages to be sent from this process.
+    #
+    # If the $WATCHDOG_USEC environment variable is set,
+    # and the $WATCHDOG_PID variable is unset or set to the PID of the current
+    # process
+    #
+    # @note Unlike sd_watchdog_enabled(3), this method does not mutate the
+    #   environment.
+    def self.watchdog?
+      wd_usec = ENV["WATCHDOG_USEC"]
+      wd_pid = ENV["WATCHDOG_PID"]
+
+      return false unless wd_usec
+
+      begin
+        wd_usec = Integer(wd_usec)
+      rescue
+        return false
+      end
+
+      return false if wd_usec <= 0
+      return true if !wd_pid || wd_pid == $$.to_s
+
+      false
+    end
+
+    # Notify systemd with the provided state, via the notification socket, if
+    # any.
+    #
+    # Generally this method will be used indirectly through the other methods
+    # of the library.
+    #
+    # @param state [String]
+    # @param unset_env [Boolean]
+    #
+    # @return [Fixnum, nil] the number of bytes written to the notification
+    #   socket or nil if there was no socket to report to (eg. the program wasn't
+    #   started by systemd)
+    #
+    # @raise [NotifyError] if there was an error communicating with the systemd
+    #   socket
+    #
+    # @see https://www.freedesktop.org/software/systemd/man/sd_notify.html
+    def self.notify(state, unset_env = false)
+      sock = ENV["NOTIFY_SOCKET"]
+
+      return nil unless sock
+
+      ENV.delete("NOTIFY_SOCKET") if unset_env
+
+      begin
+        Addrinfo.unix(sock, :DGRAM).connect do |s|
+          s.close_on_exec = true
+          s.write(state)
+        end
+      rescue => e
+        raise NotifyError, "#{e.class}: #{e.message}", e.backtrace
+      end
+    end
+  end
+end

data/lib/sidekiq/systemd.rb

@@ -0,0 +1,24 @@
+#
+# Sidekiq's systemd integration allows Sidekiq to inform systemd:
+#  1. when it has successfully started
+#  2. when it is starting shutdown
+#  3. periodically for a liveness check with a watchdog thread
+#
+module Sidekiq
+  def self.start_watchdog
+    usec = Integer(ENV["WATCHDOG_USEC"])
+    return Sidekiq.logger.error("systemd Watchdog too fast: " + usec) if usec < 1_000_000
+
+    sec_f = usec / 1_000_000.0
+    # "It is recommended that a daemon sends a keep-alive notification message
+    # to the service manager every half of the time returned here."
+    ping_f = sec_f / 2
+    Sidekiq.logger.info "Pinging systemd watchdog every #{ping_f.round(1)} sec"
+    Thread.new do
+      loop do
+        sleep ping_f
+        Sidekiq::SdNotify.watchdog
+      end
+    end
+  end
+end

data/lib/sidekiq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sidekiq
-  VERSION = "6.0.5"
+  VERSION = "6.0.7"
 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

@@ -19,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)
@@ -275,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
@@ -308,7 +308,7 @@ module Sidekiq
           "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]]

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/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;
 }

data/web/locales/fr.yml

@@ -69,9 +69,9 @@ fr:
   Jobs: Tâches
   Paused: Mise en pause
   Stop: Arrêter
-  Quiet: Clôturer
+  Quiet: Clore
   StopAll: Tout arrêter
-  QuietAll: Tout clôturer
+  QuietAll: Tout clore
   PollingInterval: Interval de rafraîchissement
   Plugins: Plugins
   NotYetEnqueued: Pas encore en file d'attente

data/web/locales/lt.yml

@@ -0,0 +1,83 @@
+# elements like %{queue} are variables and should not be translated
+lt:
+  Dashboard: Valdymo skydas
+  Status: Būsena
+  Time: Laikas
+  Namespace: Vardų erdvė
+  Realtime: Realiu laiku
+  History: Istorija
+  Busy: Užimti
+  Processed: Įvykdyti
+  Failed: Nepavykę
+  Scheduled: Suplanuoti
+  Retries: Kartojami
+  Enqueued: Eilėje
+  Worker: Darbuotojas
+  LivePoll: Užklausti gyvai
+  StopPolling: Stabdyti užklausas
+  Queue: Eilė
+  Class: Klasė
+  Job: Darbas
+  Arguments: Parametrai
+  Extras: Papildomi
+  Started: Pradėti
+  ShowAll: Rodyti Visus
+  CurrentMessagesInQueue: Esami darbai eilėje <span class='title'>%{queue}</span>
+  Delete: Pašalinti
+  AddToQueue: Pridėti į eilę
+  AreYouSureDeleteJob: Ar tikrai norite pašalinti šį darbą?
+  AreYouSureDeleteQueue: Ar tikrai norite pašalinti šią eilę %{queue}?
+  Queues: Eilės
+  Size: Dydis
+  Actions: Veiksmai
+  NextRetry: Sekantis Kartojimas
+  RetryCount: Kartojimų Skaičius
+  RetryNow: Kartoti Dabar
+  Kill: Priverstinai Nutraukti
+  LastRetry: Paskutinis Kartojimas
+  OriginallyFailed: Iš pradžių Nepavykę
+  AreYouSure: Ar jūs įsitikinę?
+  DeleteAll: Pašalinti Visus
+  RetryAll: Kartoti Visus
+  KillAll: Priverstinai Nutraukti Visus
+  NoRetriesFound: Nerasta kartojimų
+  Error: Klaida
+  ErrorClass: Klaidos Klasė
+  ErrorMessage: Klaidos Žinutė
+  ErrorBacktrace: Klaidos Pėdsakai
+  GoBack: ← Atgal
+  NoScheduledFound: Planuojamų darbų nerasta
+  When: Kada
+  ScheduledJobs: Planuojami Darbai
+  idle: neveiksnus
+  active: aktyvus
+  Version: Versija
+  Connections: Ryšiai
+  MemoryUsage: Atminties Vartojimas
+  PeakMemoryUsage: Atminties Vartojimo Pikas
+  Uptime: Gyvavimo laikas (dienomis)
+  OneWeek: 1 savaitė
+  OneMonth: 1 mėnuo
+  ThreeMonths: 3 mėnesiai
+  SixMonths: 6 mėnesiai
+  Failures: Nesėkmingi vykdymai
+  DeadJobs: Negyvi Darbai
+  NoDeadJobsFound: Negyvų darbų nerasta
+  Dead: Negyvi
+  Processes: Procesai
+  Thread: Gija
+  Threads: Gijos
+  Jobs: Darbai
+  Paused: Pristabdytas
+  Stop: Sustabdyti
+  Quiet: Nutildyti
+  StopAll: Sustbadyti Visus
+  QuietAll: Nutildyti Visus
+  PollingInterval: Užklausimų intervalas
+  Plugins: Įskiepiai
+  NotYetEnqueued: Dar neįtraukti į eilę
+  CreatedAt: Sukurta
+  BackToApp: Atgal į Aplikaciją
+  Latency: Vėlavimas
+  Pause: Pristabdyti
+  Unpause: Pratęsti

data/web/locales/vi.yml

@@ -0,0 +1,83 @@
+# elements like %{queue} are variables and should not be translated
+vi: # <---- change this to your locale code
+  Dashboard: Bảng điều khiển
+  Status: Trạng thái
+  Time: Thời gian
+  Namespace: Không gian tên
+  Realtime: Thời gian thực
+  History: Lịch sử
+  Busy: Bận rộn
+  Processed: Đã xử lí
+  Failed: Đã thất bại
+  Scheduled: Đã lên lịch
+  Retries: Số lần thử
+  Enqueued: Đã xếp hàng đợi
+  Worker: Máy xử lí
+  LivePoll: Thăm dò trực tiếp
+  StopPolling: Ngừng thăm dò
+  Queue: Hàng đợi
+  Class: Lớp
+  Job: Tác vụ
+  Arguments: Tham số
+  Extras: Thêm
+  Started: Đã bắt đầu
+  ShowAll: Hiện tất cả
+  CurrentMessagesInQueue: Số lượng công việc trong <span class='title'>%{queue}</span>
+  Delete: Xóa
+  AddToQueue: Thêm vào hàng đợi
+  AreYouSureDeleteJob: Bạn có chắc là muốn xóa tác vụ này?
+  AreYouSureDeleteQueue: Bạn có chắc là muốn xóa %{queue} này?
+  Queues: Các hàng đợi
+  Size: Kích thước
+  Actions: Những hành động
+  NextRetry: Lần thử lại tiếp theo
+  RetryCount: Số lần thử lại
+  RetryNow: Thử lại ngay bây giờ
+  Kill: Giết
+  LastRetry: Lần thử cuối
+  OriginallyFailed: Đã thất bại từ đầu
+  AreYouSure: Bạn chắc chứ?
+  DeleteAll: Xóa hết
+  RetryAll: Thử lại tất cả
+  KillAll: Giết hết
+  NoRetriesFound: Không có lần thử nào được tìm thấy
+  Error: Lỗi
+  ErrorClass: Lớp lỗi
+  ErrorMessage: Tin nhắn lỗi
+  ErrorBacktrace: Dấu vết của lỗi
+  GoBack: ← Trở lại
+  NoScheduledFound: Không có tác vụ đã lên lịch nào được tìm thấy
+  When: Khi nào
+  ScheduledJobs: Những Tác Vụ Được Hẹn
+  idle: Đang chờ
+  active: Đang hoạt động
+  Version: Phiên bản
+  Connections: Các kết nối
+  MemoryUsage: Lượng bộ nhớ sử dụng
+  PeakMemoryUsage: Lượng bộ nhớ sử dụng đỉnh điểm
+  Uptime: Thời gian hệ thống đã online (days)
+  OneWeek: 1 tuần
+  OneMonth: 1 tháng
+  ThreeMonths: 3 tháng
+  SixMonths: 6 tháng
+  Failures: Các thất bại
+  DeadJobs: Những tác vụ đã chết
+  NoDeadJobsFound: Không có tác vụ đã chết nào được tìm thấy
+  Dead: Chết
+  Processes: Tiến trình xử lí
+  Thread: Luồng xử lí
+  Threads: Những luồng xử lí
+  Jobs: Các tác vụ
+  Paused: Đã tạm dừng
+  Stop: Dừng Lại
+  Quiet: Im lặng
+  StopAll: Dừng lại tất cả
+  QuietAll: Làm cho tất cả im lặng
+  PollingInterval: Khoảng thời gian giữa các lần thăm dò
+  Plugins: Hệ thống đính kèm
+  NotYetEnqueued: Chưa được bỏ vào hàng đợi
+  CreatedAt: Được tạo vào lúc
+  BackToApp: Trở về ứng dụng
+  Latency: Độ trễ
+  Pause: Tạm dừng
+  Unpause: Hủy tạm dừng

data/web/views/layout.erb

@@ -11,7 +11,7 @@
     <% end %>
 
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
-    <link href="<%= root_path %>stylesheets/application-dark.css" media="screen" rel="stylesheet" type="text/css" />
+    <link href="<%= root_path %>stylesheets/application-dark.css" media="screen and (prefers-color-scheme: dark)" rel="stylesheet" type="text/css" />
     <% if rtl? %>
     <link href="<%= root_path %>stylesheets/application-rtl.css" media="screen" rel="stylesheet" type="text/css" />
     <% end %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 6.0.5
+  version: 6.0.7
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-14 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -130,6 +130,8 @@ files:
 - lib/sidekiq/rails.rb
 - lib/sidekiq/redis_connection.rb
 - lib/sidekiq/scheduled.rb
+- lib/sidekiq/sd_notify.rb
+- lib/sidekiq/systemd.rb
 - lib/sidekiq/testing.rb
 - lib/sidekiq/testing/inline.rb
 - lib/sidekiq/util.rb
@@ -165,6 +167,7 @@ files:
 - web/locales/it.yml
 - web/locales/ja.yml
 - web/locales/ko.yml
+- web/locales/lt.yml
 - web/locales/nb.yml
 - web/locales/nl.yml
 - web/locales/pl.yml
@@ -175,6 +178,7 @@ files:
 - web/locales/ta.yml
 - web/locales/uk.yml
 - web/locales/ur.yml
+- web/locales/vi.yml
 - web/locales/zh-cn.yml
 - web/locales/zh-tw.yml
 - web/views/_footer.erb