sidekiq 2.6.5 → 2.7.0

data/.gitignore

@@ -1,3 +1,4 @@
+.rvmrc
 tags
 Gemfile.lock
 *.swp

data/.public_cert.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MRAwDgYDVQQDDAdtcGVy
+aGFtMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNjb20w
+HhcNMTMwMTMwMTkyODU3WhcNMTQwMTMwMTkyODU3WjA+MRAwDgYDVQQDDAdtcGVy
+aGFtMRUwEwYKCZImiZPyLGQBGRYFZ21haWwxEzARBgoJkiaJk/IsZAEZFgNjb20w
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC/rvUwLpOQEsPfi1T/QtRj
+dc7+0DE8ljILJqJ+sUkZ881Uxit6M+8ZZoqNkwa2e2RCWRBdNx625RQh2bX4utpY
+kloTWQ6PBbrDDVHVRAkuwDbaH4wE8rtwXDcKuto4xaHjN+EYWf2rHBNC4+qMX+ev
+CD3MRBG7xOURthDpRTKBXTnDA6qPlFH+4BONLyUOPgz2j0hzVQbA/795KJXpIih9
+goEiaWzvvqs8upsdFGQoVvaFUKE/Zr79Zm0kNC7dDtG0toHll0XMFUL/JjJT2Rh2
+cALDwIxwVdL7r6l2O4qeuXL7HKSC5ZyNqx3JoVwrxfXk2I2DOGBqrGSJJFWUq3i1
+AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFNGAnRmrLLc4NFfTSL2PjpAx
+GJnfMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAf9vqK2frmnKcyDE7
+dt9eLthYUxZ8HlctLSXDs4tjlEKKfwkD1Yalu4PNzhjrHqXa8hYTxqHPfWmV771q
+qT/OLVvL4ofjrXmAG+hqwzcT7grSbYDAK14ITY8M8DpC2jvuGR3MnyChi9ep0pLa
+E9Jy35lxa3UFBjr0neI9QxowMilmjUHnPDzVHbzmWAQxPoc18uiU9PXd0h+Jsx2F
+y8Ix+zZ1LIOWk9O9WnMdLOTjUFnA/zutM3Nzv8zNBnUJjH5/A5igCIAL+6vU7+su
+sLF+JCFPbBgvRqL5hX03CKuyOUNmUVT5AnCDnfIDUV/kJhX7Wfr6IqaUHmUcy/jn
+ey6hlw==
+-----END CERTIFICATE-----

data/Changes.md

@@ -1,3 +1,36 @@
+2.7.0
+-----------
+
+- Add -d daemonize flag, capistrano recipe has been updated to use it [#662]
+- Support profiling via `ruby-prof` with -p.  When Sidekiq is stopped
+  via Ctrl-C, it will output `profile.html`.  You must add `gem 'ruby-prof'` to your Gemfile for it to work.
+- Dynamically update Redis stats on dashboard [brandonhilkert]
+- Add Sidekiq::Workers API giving programmatic access to the current
+  set of active workers.
+
+```
+workers = Sidekiq::Workers.new
+workers.size => 2
+workers.each do |name, work|
+  # name is a unique identifier per Processor instance
+  # work is a Hash which looks like:
+  # { 'queue' => name, 'run_at' => timestamp, 'payload' => msg }
+end
+```
+
+- Allow environment-specific sections within the config file which
+override the global values [dtaniwaki, #630]
+
+```
+---
+:concurrency:  50
+:verbose:      false
+staging:
+  :verbose:      true
+  :concurrency:  5
+```
+
+
 2.6.5
 -----------
 

data/Gemfile

@@ -12,4 +12,5 @@ end
 group :development do
   gem 'pry', :platform => :mri
   gem 'shotgun'
+  gem 'rack', '~> 1.4.0'
 end

data/examples/runit/README.md

@@ -0,0 +1,16 @@
+This is a "service" directory for sidekiq. You should probably modify
+the relevant paths in the run script, and the log/run script, if
+necessary. It assumes a "sidekiq" user is created that will run the
+sidekiq process. To supervise under runit, link this directory to the
+runsvdir for your system (e.g., `/etc/service` on Debian/Ubuntu).
+
+If you're using Chef, use the
+[example cookbook](https://github.com/mperham/sidekiq/tree/master/examples/chef/cookbooks/sidekiq)
+(modified for your environment), and Opscode's
+[runit cookbook](http://ckbk.it/runit) to set up the service.
+
+Author: Joshua Timberman <joshua@opscode.com>
+
+Runit is written by Gerrit Pape.
+
+* http://smarden.org/runit

data/examples/runit/log/run

@@ -0,0 +1,2 @@
+#!/bin/sh
+exec svlogd -tt /var/log/sidekiq

data/examples/runit/run

@@ -0,0 +1,4 @@
+#!/bin/sh
+cd /path/to/sidekiq
+exec 2>&1
+exec chpst -usidekiq bundle exec sidekiq -e production -P /var/run/sidekiq/sidekiq.pid

data/examples/upstart.conf

@@ -0,0 +1,39 @@
+# /etc/init/sidekiq.conf - Sidekiq config
+
+# This example config should work with Ubuntu 12.04+
+#
+# Save this config as /etc/init/sidekiq.conf then mange sidekiq with:
+#   sudo start sidekiq
+#   sudo stop sidekiq
+#   sudo status sidekiq
+#
+# or use the service command:
+#   sudo service sidekiq {start,stop,restart,status}
+#
+# This is the exact script used to manage Sidekiq on TheClymb.com
+#
+
+description "Sidekiq Background Worker System"
+
+start on runlevel [2345]
+stop  on shutdown
+
+setuid deploy
+setgid deploy
+
+respawn
+respawn limit 3 30
+
+script
+# this script runs in /bin/sh by default
+# respawn as bash so we can source in rbenv
+exec /bin/bash <<EOT
+  # use syslog for logging
+  exec >/dev/kmsg 2>&1
+  # pull in system rbenv
+  source /etc/profile.d/rbenv.sh
+
+  cd /opt/theclymb/current
+  exec bin/sidekiq -e production -C config/sidekiq.yml -P tmp/pids/sidekiq.pid
+EOT
+end script

data/lib/sidekiq.rb

@@ -23,6 +23,7 @@ module Sidekiq
     :require => '.',
     :environment => nil,
     :timeout => 8,
+    :profile => false,
   }
 
   def self.options
@@ -61,14 +62,15 @@ module Sidekiq
   end
 
   def self.redis(&block)
-    @redis ||= Sidekiq::RedisConnection.create
     raise ArgumentError, "requires a block" if !block
+    @redis ||= Sidekiq::RedisConnection.create
     @redis.with(&block)
   end
 
   def self.redis=(hash)
     if hash.is_a?(Hash)
       @redis = RedisConnection.create(hash)
+      options[:namespace] ||= hash[:namespace]
     elsif hash.is_a?(ConnectionPool)
       @redis = hash
     else

data/lib/sidekiq/api.rb

@@ -210,6 +210,11 @@ module Sidekiq
       @parent.delete(score, jid)
     end
 
+    def reschedule(at)
+      @parent.delete(score, jid)
+      @parent.schedule(at, item)
+    end
+
     def retry
       raise "Retry not available on jobs not in the Retry queue." unless item["failed_at"]
       Sidekiq.redis do |conn|
@@ -235,6 +240,12 @@ module Sidekiq
       Sidekiq.redis {|c| c.zcard(@zset) }
     end
 
+    def schedule(timestamp, message)
+      Sidekiq.redis do |conn|
+        conn.zadd(@zset, timestamp.to_s, Sidekiq.dump_json(message))
+      end
+    end
+
     def each(&block)
       # page thru the sorted set backwards so deleting entries doesn't screw up indexing
       page = -1
@@ -333,4 +344,43 @@ module Sidekiq
     end
   end
 
+
+  ##
+  # Programmatic access to the current active worker set.
+  #
+  # WARNING WARNING WARNING
+  #
+  # This is live data that can change every millisecond.
+  # If you do #size => 5 and then expect #each to be
+  # called 5 times, you're going to have a bad time.
+  #
+  #    workers = Sidekiq::Workers.new
+  #    workers.size => 2
+  #    workers.each do |name, work|
+  #      # name is a unique identifier per Processor instance
+  #      # work is a Hash which looks like:
+  #      # { 'queue' => name, 'run_at' => timestamp, 'payload' => msg }
+  #    end
+
+  class Workers
+    include Enumerable
+
+    def each(&block)
+      Sidekiq.redis do |conn|
+        workers = conn.smembers("workers")
+        workers.each do |w|
+          msg = conn.get("worker:#{w}")
+          next unless msg
+          block.call(w, Sidekiq.load_json(msg))
+        end
+      end
+    end
+
+    def size
+      Sidekiq.redis do |conn|
+        conn.scard("workers")
+      end.to_i
+    end
+  end
+
 end

data/lib/sidekiq/capistrano.rb

@@ -2,7 +2,7 @@ Capistrano::Configuration.instance.load do
   before "deploy:update_code", "sidekiq:quiet"
   after "deploy:stop",    "sidekiq:stop"
   after "deploy:start",   "sidekiq:start"
-  after "deploy:restart", "sidekiq:restart"
+  before "deploy:restart", "sidekiq:restart"
 
   _cset(:sidekiq_cmd) { "#{fetch(:bundle_cmd, "bundle")} exec sidekiq" }
   _cset(:sidekiqctl_cmd) { "#{fetch(:bundle_cmd, "bundle")} exec sidekiqctl" }
@@ -21,14 +21,14 @@ Capistrano::Configuration.instance.load do
     desc "Quiet sidekiq (stop accepting new work)"
     task :quiet, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
       for_each_process do |pid_file, idx|
-        run "if [ -d #{current_path} ] && [ -f #{pid_file} ]; then cd #{current_path} && #{fetch(:sidekiqctl_cmd)} quiet #{pid_file} ; fi"
+        run "if [ -d #{current_path} ] && [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then cd #{current_path} && #{fetch(:sidekiqctl_cmd)} quiet #{pid_file} ; else echo 'Sidekiq is not running'; fi"
       end
     end
 
     desc "Stop sidekiq"
     task :stop, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
       for_each_process do |pid_file, idx|
-        run "if [ -d #{current_path} ] && [ -f #{pid_file} ]; then cd #{current_path} && #{fetch(:sidekiqctl_cmd)} stop #{pid_file} #{fetch :sidekiq_timeout} ; fi"
+        run "if [ -d #{current_path} ] && [ -f #{pid_file} ] && kill -0 `cat #{pid_file}`> /dev/null 2>&1; then cd #{current_path} && #{fetch(:sidekiqctl_cmd)} stop #{pid_file} #{fetch :sidekiq_timeout} ; else echo 'Sidekiq is not running'; fi"
       end
     end
 
@@ -36,7 +36,7 @@ Capistrano::Configuration.instance.load do
     task :start, :roles => lambda { fetch(:sidekiq_role) }, :on_no_matching_servers => :continue do
       rails_env = fetch(:rails_env, "production")
       for_each_process do |pid_file, idx|
-        run "cd #{current_path} ; nohup #{fetch(:sidekiq_cmd)} -e #{rails_env} -C #{current_path}/config/sidekiq.yml -i #{idx} -P #{pid_file} >> #{current_path}/log/sidekiq.log 2>&1 &", :pty => false
+        run "cd #{current_path} ; #{fetch(:sidekiq_cmd)} -d -e #{rails_env} -C #{current_path}/config/sidekiq.yml -i #{idx} -P #{pid_file} -L #{current_path}/log/sidekiq.log"
       end
     end
 

data/lib/sidekiq/cli.rb

@@ -1,4 +1,11 @@
 trap 'INT' do
+  if Sidekiq.options[:profile]
+    result = RubyProf.stop
+    printer = RubyProf::GraphHtmlPrinter.new(result)
+    File.open("profile.html", 'w') do |f|
+      printer.print(f, :min_percent => 1)
+    end
+  end
   # Handle Ctrl-C in JRuby like MRI
   # http://jira.codehaus.org/browse/JRUBY-4637
   Sidekiq::CLI.instance.interrupt
@@ -38,13 +45,10 @@ $stdout.sync = true
 require 'yaml'
 require 'singleton'
 require 'optparse'
-require 'celluloid'
 require 'erb'
 
 require 'sidekiq'
 require 'sidekiq/util'
-require 'sidekiq/manager'
-require 'sidekiq/scheduled'
 
 module Sidekiq
   class CLI
@@ -54,6 +58,7 @@ module Sidekiq
     # Used for CLI testing
     attr_accessor :code
     attr_accessor :manager
+    attr_accessor :environment
 
     def initialize
       @code = nil
@@ -64,13 +69,12 @@ module Sidekiq
     def parse(args=ARGV)
       @code = nil
 
-      cli = parse_options(args)
-      config = parse_config(cli)
-      options.merge!(config.merge(cli))
-
+      setup_options(args)
       initialize_logger
       validate!
+      daemonize
       write_pid
+      load_celluloid
       boot_system
     end
 
@@ -81,10 +85,17 @@ module Sidekiq
 
       Sidekiq::Stats::History.cleanup
 
+      if !options[:daemon]
+        logger.info 'Starting processing, hit Ctrl-C to stop'
+      end
+
       @manager = Sidekiq::Manager.new(options)
       poller = Sidekiq::Scheduled::Poller.new
       begin
-        logger.info 'Starting processing, hit Ctrl-C to stop'
+        if options[:profile]
+          require 'ruby-prof'
+          RubyProf.start
+        end
         @manager.async.start
         poller.async.poll(true)
         sleep
@@ -110,20 +121,71 @@ module Sidekiq
 
     private
 
+    def load_celluloid
+      # Celluloid can't be loaded until after we've daemonized
+      # because it spins up threads and creates locks which get
+      # into a very bad state if forked.
+      require 'celluloid'
+      Celluloid.logger = (options[:verbose] ? Sidekiq.logger : nil)
+
+      require 'sidekiq/manager'
+      require 'sidekiq/scheduled'
+    end
+
+    def daemonize
+      return unless options[:daemon]
+
+      raise ArgumentError, "You really should set a logfile if you're going to daemonize" unless options[:logfile]
+      files_to_reopen = []
+      ObjectSpace.each_object(File) do |file|
+        files_to_reopen << file unless file.closed?
+      end
+
+      Process.daemon(true, true)
+
+      files_to_reopen.each do |file|
+        begin
+          file.reopen file.path, "a+"
+          file.sync = true
+        rescue ::Exception
+        end
+      end
+
+      [$stdout, $stderr].each do |io|
+        File.open(options[:logfile], 'ab') do |f|
+          io.reopen(f)
+        end
+        io.sync = true
+      end
+      $stdin.reopen('/dev/null')
+
+      initialize_logger
+    end
+
+    def set_environment(cli_env)
+      @environment = cli_env || ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+    end
+
     def die(code)
       exit(code)
     end
 
-    def options
-      Sidekiq.options
+    def setup_options(args)
+      cli = parse_options(args)
+      set_environment cli[:environment]
+
+      cfile = cli[:config_file]
+
+      config = (cfile ? parse_config(cfile) : {})
+      options.merge!(config.merge(cli))
     end
 
-    def detected_environment
-      options[:environment] ||= ENV['RAILS_ENV'] || ENV['RACK_ENV'] || 'development'
+    def options
+      Sidekiq.options
     end
 
     def boot_system
-      ENV['RACK_ENV'] = ENV['RAILS_ENV'] = detected_environment
+      ENV['RACK_ENV'] = ENV['RAILS_ENV'] = environment
 
       raise ArgumentError, "#{options[:require]} does not exist" unless File.exist?(options[:require])
 
@@ -167,41 +229,45 @@ module Sidekiq
       opts = {}
 
       @parser = OptionParser.new do |o|
-        o.on "-q", "--queue QUEUE[,WEIGHT]...", "Queues to process with optional weights" do |arg|
-          queues_and_weights = arg.scan(/([\w\.-]+),?(\d*)/)
-          parse_queues opts, queues_and_weights
+        o.on '-c', '--concurrency INT', "processor threads to use" do |arg|
+          opts[:concurrency] = Integer(arg)
         end
 
-        o.on "-v", "--verbose", "Print more verbose output" do |arg|
-          opts[:verbose] = arg
+        o.on '-d', '--daemon', "Daemonize process" do |arg|
+          opts[:daemon] = arg
         end
 
         o.on '-e', '--environment ENV', "Application environment" do |arg|
           opts[:environment] = arg
         end
 
-        o.on '-t', '--timeout NUM', "Shutdown timeout" do |arg|
-          opts[:timeout] = Integer(arg)
-        end
-
         o.on '-g', '--tag TAG', "Process tag for procline" do |arg|
           opts[:tag] = arg
         end
 
-        o.on '-r', '--require [PATH|DIR]', "Location of Rails application with workers or file to require" do |arg|
-          opts[:require] = arg
-        end
-
         o.on '-i', '--index INT', "unique process index on this machine" do |arg|
           opts[:index] = Integer(arg)
         end
 
-        o.on '-c', '--concurrency INT', "processor threads to use" do |arg|
-          opts[:concurrency] = Integer(arg)
+        o.on '-p', '--profile', "Profile all code run by Sidekiq" do |arg|
+          opts[:profile] = arg
         end
 
-        o.on '-P', '--pidfile PATH', "path to pidfile" do |arg|
-          opts[:pidfile] = arg
+        o.on "-q", "--queue QUEUE[,WEIGHT]...", "Queues to process with optional weights" do |arg|
+          queues_and_weights = arg.scan(/([\w\.-]+),?(\d*)/)
+          parse_queues opts, queues_and_weights
+        end
+
+        o.on '-r', '--require [PATH|DIR]', "Location of Rails application with workers or file to require" do |arg|
+          opts[:require] = arg
+        end
+
+        o.on '-t', '--timeout NUM', "Shutdown timeout" do |arg|
+          opts[:timeout] = Integer(arg)
+        end
+
+        o.on "-v", "--verbose", "Print more verbose output" do |arg|
+          opts[:verbose] = arg
         end
 
         o.on '-C', '--config PATH', "path to YAML config file" do |arg|
@@ -212,6 +278,10 @@ module Sidekiq
           opts[:logfile] = arg
         end
 
+        o.on '-P', '--pidfile PATH', "path to pidfile" do |arg|
+          opts[:pidfile] = arg
+        end
+
         o.on '-V', '--version', "Print version and exit" do |arg|
           puts "Sidekiq #{Sidekiq::VERSION}"
           die(0)
@@ -231,7 +301,6 @@ module Sidekiq
       Sidekiq::Logging.initialize_logger(options[:logfile]) if options[:logfile]
 
       Sidekiq.logger.level = Logger::DEBUG if options[:verbose]
-      Celluloid.logger = nil unless options[:verbose]
     end
 
     def write_pid
@@ -242,11 +311,14 @@ module Sidekiq
       end
     end
 
-    def parse_config(cli)
+    def parse_config(cfile)
       opts = {}
-      if cli[:config_file] && File.exist?(cli[:config_file])
-        opts = YAML.load(ERB.new(IO.read(cli[:config_file])).result)
+      if File.exist?(cfile)
+        opts = YAML.load(ERB.new(IO.read(cfile)).result)
+        opts = opts.merge(opts.delete(environment) || {})
         parse_queues opts, opts.delete(:queues) || []
+      else
+        raise ArgumentError, "can't find config file #{cfile}"
       end
       opts
     end

data/lib/sidekiq/redis_connection.rb

@@ -9,9 +9,10 @@ module Sidekiq
       driver = options[:driver] || 'ruby'
       # need a connection for Fetcher and Retry
       size = options[:size] || (Sidekiq.server? ? (Sidekiq.options[:concurrency] + 2) : 5)
+      namespace = options[:namespace] || Sidekiq.options[:namespace]
 
       ConnectionPool.new(:timeout => 1, :size => size) do
-        build_client(url, options[:namespace], driver)
+        build_client(url, namespace, driver)
       end
     end
 

data/lib/sidekiq/testing/inline.rb

@@ -29,7 +29,7 @@ module Sidekiq
     singleton_class.class_eval do
       alias_method :raw_push_old, :raw_push
       def raw_push(normed, payload)
-        Array.wrap(payload).each do |hash|
+        Array(payload).each do |hash|
           normed['class'].constantize.new.perform(*Sidekiq.load_json(hash)['args'])
         end
 

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "2.6.5"
+  VERSION = "2.7.0"
 end

data/lib/sidekiq/web.rb

@@ -49,6 +49,10 @@ module Sidekiq
         Sidekiq.redis { |conn| conn.client.location }
       end
 
+      def namespace
+        Sidekiq.options[:namespace]
+      end
+
       def root_path
         "#{env['SCRIPT_NAME']}/"
       end
@@ -95,6 +99,10 @@ module Sidekiq
         parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1#{options[:delimiter]}")
         parts.join(options[:separator])
       end
+
+      def redis_keys
+        ["redis_stats", "uptime_in_days", "connected_clients", "used_memory_human", "used_memory_peak_human"]
+      end
     end
 
     get "/" do
@@ -196,7 +204,7 @@ module Sidekiq
     end
 
     get '/dashboard' do
-      @redis_info = Sidekiq.redis { |conn| conn.info }
+      @redis_info = Sidekiq.redis { |conn| conn.info }.select{ |k, v| redis_keys.include? k }
       stats_history = Sidekiq::Stats::History.new((params[:days] || 30).to_i)
       @processed_history = stats_history.processed
       @failed_history = stats_history.failed
@@ -204,14 +212,19 @@ module Sidekiq
     end
 
     get '/dashboard/stats' do
-      stats = Sidekiq::Stats.new
+      sidekiq_stats = Sidekiq::Stats.new
+      redis_stats   = Sidekiq.redis { |conn| conn.info }.select{ |k, v| redis_keys.include? k }
+
       content_type :json
       Sidekiq.dump_json({
-        processed: stats.processed,
-        failed: stats.failed,
-        enqueued: stats.enqueued,
-        scheduled: stats.scheduled_size,
-        retries: stats.retry_size,
+        sidekiq: {
+          processed:  sidekiq_stats.processed,
+          failed:     sidekiq_stats.failed,
+          enqueued:   sidekiq_stats.enqueued,
+          scheduled:  sidekiq_stats.scheduled_size,
+          retries:    sidekiq_stats.retry_size,
+        },
+        redis: redis_stats
       })
     end
 

data/sidekiq.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |gem|
   gem.name          = "sidekiq"
   gem.require_paths = ["lib"]
   gem.version       = Sidekiq::VERSION
+  gem.signing_key   = File.expand_path('~/.ssh/gem-private_key.pem')
+  gem.cert_chain    = ['.public_cert.pem']
   gem.add_dependency                  'redis', '~> 3'
   gem.add_dependency                  'redis-namespace'
   gem.add_dependency                  'connection_pool', '~> 1.0'

data/test/env_based_config.yml

@@ -0,0 +1,11 @@
+---
+:pidfile:      /tmp/sidekiq-config-test.pid
+:concurrency:  50
+staging:
+  :verbose:      false
+  :require:      ./test/fake_env.rb
+  :logfile:      /tmp/sidekiq.log
+  :concurrency:  5
+  :queues:
+    - [<%="very_"%>often, 2]
+    - [seldom, 1]

data/test/test_api.rb

@@ -269,6 +269,45 @@ class TestApi < MiniTest::Unit::TestCase
       assert_equal 0, r.size
     end
 
+    it 'can enumerate workers' do
+      w = Sidekiq::Workers.new
+      assert_equal 0, w.size
+      w.each do |x, y|
+        assert false
+      end
+
+      s = '12345'
+      data = Sidekiq.dump_json({ 'payload' => {}, 'queue' => 'default', 'run_at' => Time.now.to_i })
+      Sidekiq.redis do |c| 
+        c.multi do
+          c.sadd('workers', s)
+          c.set("worker:#{s}", data)
+        end
+      end
+
+      assert_equal 1, w.size
+      w.each do |x, y|
+        assert_equal s, x
+        assert_equal 'default', y['queue']
+      end
+    end
+
+    it 'can reschedule jobs' do
+      add_retry('foo1')
+      add_retry('foo2')
+
+      retries = Sidekiq::RetrySet.new
+      assert_equal 2, retries.size
+      refute(retries.map { |r| r.score > (Time.now.to_f + 9) }.any?)
+
+      retries.each do |retri|
+        retri.reschedule(Time.now.to_f + 10) if retri.jid == 'foo2'
+      end
+
+      assert_equal 2, retries.size
+      assert(retries.map { |r| r.score > (Time.now.to_f + 9) }.any?)
+    end
+
     def add_retry(jid = 'bob', at = Time.now.to_f)
       payload = Sidekiq.dump_json('class' => 'ApiWorker', 'args' => [1, 'mike'], 'queue' => 'default', 'jid' => jid, 'retry_count' => 2, 'failed_at' => Time.now.utc)
       Sidekiq.redis do |conn|

data/test/test_cli.rb

@@ -112,7 +112,7 @@ class TestCli < MiniTest::Unit::TestCase
 
         Sidekiq.logger.info('test message')
 
-        assert_match /test message/, File.read(@tmp_log_path), "didn't include the log message"
+        assert_match(/test message/, File.read(@tmp_log_path), "didn't include the log message")
       end
 
       it 'appends messages to a logfile' do
@@ -125,8 +125,8 @@ class TestCli < MiniTest::Unit::TestCase
         Sidekiq.logger.info('test message')
 
         log_file_content = File.read(@tmp_log_path)
-        assert_match /already existant/, log_file_content, "didn't include the old message"
-        assert_match /test message/, log_file_content, "didn't include the new message"
+        assert_match(/already existant/, log_file_content, "didn't include the old message")
+        assert_match(/test message/, log_file_content, "didn't include the new message")
       end
     end
 
@@ -191,6 +191,45 @@ class TestCli < MiniTest::Unit::TestCase
       end
     end
 
+    describe 'with env based config file' do
+      before do
+        @cli.parse(['sidekiq', '-e', 'staging', '-C', './test/env_based_config.yml'])
+      end
+
+      it 'takes a path' do
+        assert_equal './test/env_based_config.yml', Sidekiq.options[:config_file]
+      end
+
+      it 'sets verbose' do
+        refute Sidekiq.options[:verbose]
+      end
+
+      it 'sets require file' do
+        assert_equal './test/fake_env.rb', Sidekiq.options[:require]
+      end
+
+      it 'sets environment' do
+        assert_equal 'staging', Sidekiq.options[:environment]
+      end
+
+      it 'sets concurrency' do
+        assert_equal 5, Sidekiq.options[:concurrency]
+      end
+
+      it 'sets pid file' do
+        assert_equal '/tmp/sidekiq-config-test.pid', Sidekiq.options[:pidfile]
+      end
+
+      it 'sets logfile' do
+        assert_equal '/tmp/sidekiq.log', Sidekiq.options[:logfile]
+      end
+
+      it 'sets queues' do
+        assert_equal 2, Sidekiq.options[:queues].count { |q| q == 'very_often' }
+        assert_equal 1, Sidekiq.options[:queues].count { |q| q == 'seldom' }
+      end
+    end
+
     describe 'with config file and flags' do
       before do
         # We need an actual file here.

data/test/test_redis_connection.rb

@@ -5,6 +5,41 @@ class TestRedisConnection < MiniTest::Unit::TestCase
 
   describe ".create" do
 
+    it "creates a pooled redis connection" do
+      pool = Sidekiq::RedisConnection.create
+      assert_equal Redis, pool.checkout.class
+    end
+
+    describe "namespace" do
+      before do
+        Sidekiq.options[:namespace] = "xxx"
+      end
+
+      after do
+        Sidekiq.options[:namespace] = nil
+      end
+
+      it "uses a given :namespace" do
+        pool = Sidekiq::RedisConnection.create(:namespace => "xxx")
+        assert_equal "xxx", pool.checkout.namespace
+      end
+
+      it "uses :namespace from Sidekiq.options" do
+        pool = Sidekiq::RedisConnection.create
+        assert_equal "xxx", pool.checkout.namespace
+      end
+
+      it "uses given :namespace over :namespace from Sidekiq.options" do
+        Sidekiq.options[:namespace] = "xxx"
+        pool = Sidekiq::RedisConnection.create(:namespace => "yyy")
+        assert_equal "yyy", pool.checkout.namespace
+      end
+
+    end
+  end
+
+  describe ".determine_redis_provider" do
+
     def with_env_var(var, uri, skip_provider=false)
       vars = ['REDISTOGO_URL', 'REDIS_PROVIDER', 'REDIS_URL'] - [var]
       vars.each do |v|

data/test/test_sidekiq.rb

@@ -11,4 +11,17 @@ class TestSidekiq < MiniTest::Unit::TestCase
     end
   end
 
+  describe "redis connection" do
+  	it "returns error without creating a connection if block is not given" do
+      mock = MiniTest::Mock.new
+      mock.expect :create, nil #Sidekiq::RedisConnection, create
+  		assert_raises(ArgumentError) {
+  			Sidekiq.redis
+  		}
+      assert_raises(MockExpectationError, "create should not be called") do
+        mock.verify
+      end
+  	end
+  end
+
 end

data/test/test_web.rb

@@ -32,7 +32,6 @@ class TestWeb < MiniTest::Unit::TestCase
       get '/'
       assert_equal 200, last_response.status
       assert_match /status-idle/, last_response.body
-      refute_match /default/, last_response.body
     end
 
     it 'can display queues' do
@@ -200,17 +199,49 @@ class TestWeb < MiniTest::Unit::TestCase
       assert_equal 200, last_response.status
     end
 
-    it 'can refresh dashboard stats' do
-      Sidekiq.redis do |conn|
-        conn.set("stat:processed", 5)
-        conn.set("stat:failed", 2)
+    describe 'stats' do
+      before do
+        Sidekiq.redis do |conn|
+          conn.set("stat:processed", 5)
+          conn.set("stat:failed", 2)
+        end
+        2.times { add_retry }
+        3.times { add_scheduled }
+        get '/dashboard/stats'
+        @response = Sidekiq.load_json(last_response.body)
       end
-      2.times { add_retry }
-      3.times { add_scheduled }
 
-      get '/dashboard/stats'
-      assert_equal 200, last_response.status
-      assert_equal "{\"processed\":5,\"failed\":2,\"enqueued\":0,\"scheduled\":3,\"retries\":2}", last_response.body
+      it 'can refresh dashboard stats' do
+        assert_equal 200, last_response.status
+      end
+
+      describe "for sidekiq" do
+        it 'are namespaced' do
+          assert_includes @response.keys, "sidekiq"
+        end
+
+        it 'reports processed' do
+          assert_equal @response["sidekiq"]["processed"], 5
+        end
+
+        it 'reports failed' do
+          assert_equal @response["sidekiq"]["failed"], 2
+        end
+
+        it 'reports retries' do
+          assert_equal @response["sidekiq"]["retries"], 2
+        end
+
+        it 'reports scheduled' do
+          assert_equal @response["sidekiq"]["scheduled"], 3
+        end
+      end
+
+      describe "for redis" do
+        it 'are namespaced' do
+          assert_includes @response.keys, "redis"
+        end
+      end
     end
 
     def add_scheduled

data/web/assets/javascripts/application.js

@@ -37,4 +37,8 @@ $(function() {
   $(document).on("click", "[data-confirm]", function() {
     return confirm($(this).attr('data-confirm'));
   });
+
+  $(document).on("click", "[data-toggle]", function() {
+    $($(this).attr('data-target')).toggle();
+  });
 });

data/web/assets/javascripts/dashboard.js

@@ -16,6 +16,8 @@ var realtimeGraph = function(updatePath) {
     width: 800,
     height: 200,
     renderer: 'line',
+    interpolation: 'linear',
+
     series: new Rickshaw.Series.FixedDuration([{ name: 'failed', color: '#B1003E' }, { name: 'processed', color: '#006f68' }], undefined, {
         timeInterval: timeInterval,
         maxDataPoints: 100,
@@ -53,7 +55,8 @@ var realtimeGraph = function(updatePath) {
       Sidekiq.processed = data.processed;
       Sidekiq.failed = data.failed;
 
-      updateStatsSummary(data);
+      updateStatsSummary(data.sidekiq);
+      updateRedisStats(data.redis);
       pulseBeacon();
     });
     i++;
@@ -69,6 +72,7 @@ var historyGraph = function() {
     width: 800,
     height: 200,
     renderer: 'line',
+    interpolation: 'linear',
     series: [
       {
         color: "#B1003E",
@@ -93,7 +97,7 @@ var historyGraph = function() {
 
   var hoverDetail = new Rickshaw.Graph.HoverDetail({
     graph: graph,
-    yFormatter: function(y) { return Math.floor(y) },
+    yFormatter: function(y) { return Math.floor(y).numberWithDelimiter() },
   });
 }
 
@@ -115,6 +119,14 @@ var updateStatsSummary = function(data) {
   $('ul.summary li.enqueued span.count').html(data.enqueued.numberWithDelimiter())
 }
 
+var updateRedisStats = function(data) {
+  $('.stat h3.redis_version').html(data.redis_version)
+  $('.stat h3.uptime_in_days').html(data.uptime_in_days)
+  $('.stat h3.connected_clients').html(data.connected_clients)
+  $('.stat h3.used_memory_human').html(data.used_memory_human)
+  $('.stat h3.used_memory_peak_human').html(data.used_memory_peak_human)
+}
+
 var pulseBeacon = function(){
   $beacon = $('.beacon')
   $beacon.find('.dot').addClass('pulse').delay(1000).queue(function(){

data/web/views/_workers.slim

@@ -15,7 +15,7 @@ table class="workers table table-hover table-bordered table-striped table-white"
         - if msg['payload']['args'].to_s.size > 100
           = msg['payload']['args'].inspect[0..100] + "... "
           button data-toggle="collapse" data-target="#worker_#{index}" class="btn btn-mini" Show All
-          .collapse[id="worker_#{index}" style="max-width: 750px;"]= msg['payload']['args']
+          .toggle[id="worker_#{index}" style="display: none;max-width: 750px;"]= msg['payload']['args']
         - else
           = msg['payload']['args']
       td== relative_time(msg['run_at'].is_a?(Numeric) ? Time.at(msg['run_at']) : Time.parse(msg['run_at']))

data/web/views/dashboard.slim

@@ -11,6 +11,7 @@ h5 Real-time
 
 h5
   span.history-heading History
+  a href="#{{current_path}}?days=7" class="history-graph #{{"active" if params[:days] == "7"}}" 1 week
   a href="#{{current_path}}" class="history-graph #{{"active" if params[:days].nil? || params[:days] == "30"}}" 1 month
   a href="#{{current_path}}?days=90" class="history-graph #{{"active" if params[:days] == "90"}}" 3 month
   a href="#{{current_path}}?days=180" class="history-graph #{{"active" if params[:days] == "180"}}" 6 month
@@ -21,25 +22,25 @@ h5 Redis
 
 - if @redis_info.fetch("redis_version", nil)
   .stat
-    h3= @redis_info.fetch("redis_version")
+    h3.redis_version= @redis_info.fetch("redis_version")
     p Version
 
 - if @redis_info.fetch("uptime_in_days", nil)
   .stat
-    h3= @redis_info.fetch("uptime_in_days")
+    h3.uptime_in_days= @redis_info.fetch("uptime_in_days")
     p Uptime (days)
 
 - if @redis_info.fetch("connected_clients", nil)
   .stat
-    h3= @redis_info.fetch("connected_clients")
+    h3.connected_clients= @redis_info.fetch("connected_clients")
     p Connections
 
 - if @redis_info.fetch("used_memory_human", nil)
   .stat
-    h3= @redis_info.fetch("used_memory_human")
+    h3.used_memory_human= @redis_info.fetch("used_memory_human")
     p Memory Usage
 
 - if @redis_info.fetch("used_memory_peak_human", nil)
   .stat
-    h3= @redis_info.fetch("used_memory_peak_human")
+    h3.used_memory_peak_human= @redis_info.fetch("used_memory_peak_human")
     p Peak Memory Usage

data/web/views/layout.slim

@@ -24,6 +24,9 @@ html
               p.navbar-text Redis: #{location}
             li
               p.navbar-text Time: #{Time.now.utc.strftime('%H:%M:%S UTC')}
+            - if namespace
+              li
+                p.navbar-text Namespace: #{namespace}
 
     #page
       .container

data/web/views/queue.slim

@@ -18,7 +18,7 @@ table class="queue table table-hover table-bordered table-striped"
         - if msg['args'] and msg['args'].to_s.size > 100
           = msg['args'].inspect[0..100] + "... "
           button data-toggle="collapse" data-target="#worker_#{index}" class="btn btn-mini" Show All
-          .collapse[id="worker_#{index}"]= msg['args']
+          .toggle[id="worker_#{index}" style="display: none;"]= msg['args']
         - else
           = msg['args']
       td

metadata

@@ -1,15 +1,42 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.7.0
   prerelease: 
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURNRENDQWhpZ0F3SUJB
+  Z0lCQURBTkJna3Foa2lHOXcwQkFRVUZBREErTVJBd0RnWURWUVFEREFkdGNH
+  VnkKYUdGdE1SVXdFd1lLQ1pJbWlaUHlMR1FCR1JZRloyMWhhV3d4RXpBUkJn
+  b0praWFKay9Jc1pBRVpGZ05qYjIwdwpIaGNOTVRNd01UTXdNVGt5T0RVM1do
+  Y05NVFF3TVRNd01Ua3lPRFUzV2pBK01SQXdEZ1lEVlFRRERBZHRjR1Z5CmFH
+  RnRNUlV3RXdZS0NaSW1pWlB5TEdRQkdSWUZaMjFoYVd3eEV6QVJCZ29Ka2lh
+  SmsvSXNaQUVaRmdOamIyMHcKZ2dFaU1BMEdDU3FHU0liM0RRRUJBUVVBQTRJ
+  QkR3QXdnZ0VLQW9JQkFRQy9ydlV3THBPUUVzUGZpMVQvUXRSagpkYzcrMERF
+  OGxqSUxKcUorc1VrWjg4MVV4aXQ2TSs4WlpvcU5rd2EyZTJSQ1dSQmROeDYy
+  NVJRaDJiWDR1dHBZCmtsb1RXUTZQQmJyRERWSFZSQWt1d0RiYUg0d0U4cnR3
+  WERjS3V0bzR4YUhqTitFWVdmMnJIQk5DNCtxTVgrZXYKQ0QzTVJCRzd4T1VS
+  dGhEcFJUS0JYVG5EQTZxUGxGSCs0Qk9OTHlVT1BnejJqMGh6VlFiQS83OTVL
+  SlhwSWloOQpnb0VpYVd6dnZxczh1cHNkRkdRb1Z2YUZVS0UvWnI3OVptMGtO
+  QzdkRHRHMHRvSGxsMFhNRlVML0pqSlQyUmgyCmNBTER3SXh3VmRMN3I2bDJP
+  NHFldVhMN0hLU0M1WnlOcXgzSm9Wd3J4ZlhrMkkyRE9HQnFyR1NKSkZXVXEz
+  aTEKQWdNQkFBR2pPVEEzTUFrR0ExVWRFd1FDTUFBd0hRWURWUjBPQkJZRUZO
+  R0FuUm1yTExjNE5GZlRTTDJQanBBeApHSm5mTUFzR0ExVWREd1FFQXdJRXNE
+  QU5CZ2txaGtpRzl3MEJBUVVGQUFPQ0FRRUFmOXZxSzJmcm1uS2N5REU3CmR0
+  OWVMdGhZVXhaOEhsY3RMU1hEczR0amxFS0tmd2tEMVlhbHU0UE56aGpySHFY
+  YThoWVR4cUhQZldtVjc3MXEKcVQvT0xWdkw0b2ZqclhtQUcraHF3emNUN2dy
+  U2JZREFLMTRJVFk4TThEcEMyanZ1R1IzTW55Q2hpOWVwMHBMYQpFOUp5MzVs
+  eGEzVUZCanIwbmVJOVF4b3dNaWxtalVIblBEelZIYnptV0FReFBvYzE4dWlV
+  OVBYZDBoK0pzeDJGCnk4SXgreloxTElPV2s5TzlXbk1kTE9UalVGbkEvenV0
+  TTNOenY4ek5CblVKakg1L0E1aWdDSUFMKzZ2VTcrc3UKc0xGK0pDRlBiQmd2
+  UnFMNWhYMDNDS3V5T1VObVVWVDVBbkNEbmZJRFVWL2tKaFg3V2ZyNklxYVVI
+  bVVjeS9qbgpleTZobHc9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -197,7 +224,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rvmrc
+- .public_cert.pem
 - .travis.yml
 - COMM-LICENSE
 - Changes.md
@@ -218,9 +245,13 @@ files:
 - examples/config.yml
 - examples/monitrc.conf
 - examples/por.rb
+- examples/runit/README.md
+- examples/runit/log/run
+- examples/runit/run
 - examples/scheduling.rb
 - examples/sidekiq
 - examples/sinkiq.rb
+- examples/upstart.conf
 - examples/web-ui.png
 - lib/sidekiq.rb
 - lib/sidekiq/api.rb
@@ -255,6 +286,7 @@ files:
 - lib/sidekiq/yaml_patch.rb
 - sidekiq.gemspec
 - test/config.yml
+- test/env_based_config.yml
 - test/fake_env.rb
 - test/helper.rb
 - test/test_api.rb
@@ -317,12 +349,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Simple, efficient message processing for Ruby
 test_files:
 - test/config.yml
+- test/env_based_config.yml
 - test/fake_env.rb
 - test/helper.rb
 - test/test_api.rb

data/.rvmrc

@@ -1,3 +0,0 @@
-export RUBYOPT="-Ilib:test"
-rvm use 1.9.3-p327@sidekiq --create
-#rvm use jruby@sidekiq --create