sidekiq 3.2.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39626a2f12ce1c55fc3b6aec763a780fbbf3afe3
-  data.tar.gz: d4edda55a00c8ee2fa5f67a102b71b3ee24cac18
+  metadata.gz: ac4be785d484b8190a4aeb09fc93d21f4897f2f1
+  data.tar.gz: 9955d71f3356939e2cc06f7287f66d850b18604c
 SHA512:
-  metadata.gz: f4ca3aea1d5c28672337e784d9f34531f8d495f210e6a3f6c6aef56a34a91546f4bc77e8d89fedf655514b18bafff9209a3e0cc959a533ebc3c696f78a46c132
-  data.tar.gz: b64813b493d5672027cdeeac9ff981d1aa6f2a2faab92a08b6e08a318205e1ec857c9abb500f8ce3a9b8908378988e10de147a8a43402f10071af5b0c528509b
+  metadata.gz: ba6263b604d50445ad7582a49870daf4af2105570d0d43fe6702128903bdda651c640435eff1d4f61fdeb828193ed91fc6552b536f87fc8cee3d4b313b7c13f9
+  data.tar.gz: 260002fc92ba5a50aa910402f388ca1f77f2c21aab076fcd59f8e9d04c68e48cbd2b2889f89ef1caee745e9a585af86f1ea9caa65c46af68983d23f66ec0e55c

data/.travis.yml

@@ -2,7 +2,6 @@ language: ruby
 services:
   - redis-server
 rvm:
-  - 1.9.3
   - jruby-19mode
   - rbx-2
   - 2.0.0

data/Changes.md

@@ -1,3 +1,13 @@
+3.2.2
+-----------
+
+- Fix issue which could cause Sidekiq workers to disappear from the Busy
+  tab while still being active [#1884]
+- Add "Back to App" button in Web UI.  You can set the button link via
+  `Sidekiq::Web.app_url = 'http://www.mysite.com'` [#1875, seuros]
+- Add process tag (`-g tag`) to the Busy page so you can differentiate processes at a glance. [seuros, #1878]
+- Add "Kill" button to move retries directly to the DJQ so they don't retry. [seuros, #1867]
+
 3.2.1
 -----------
 
@@ -173,7 +183,7 @@ middleware, see 3.0-Upgrade.md.**
 
 - Automatically use the config file found at `config/sidekiq.yml`, if not passed `-C`. [#1481]
 - Store 'retried\_at' and 'failed\_at' timestamps as Floats, not Strings. [#1473]
-- A `USR2` signal will now reopen _all_ logs, using IO#reopen. Thus, instead of creating a new Logger object, 
+- A `USR2` signal will now reopen _all_ logs, using IO#reopen. Thus, instead of creating a new Logger object,
   Sidekiq will now just update the existing Logger's file descriptor [#1163].
 - Remove pidfile when shutting down if started with `-P` [#1470]
 

data/Contributing.md

@@ -20,6 +20,16 @@ fix or new functionality.  Functionality must meet my design goals and
 vision for the project to be accepted; I would be happy to discuss how
 your idea can best fit into Sidekiq.
 
-## Sponsorship
+## Legal
+
+By submitting a Pull Request, you disavow any rights or
+claims to any changes submitted to the Sidekiq project and assign the copyright of
+those changes to Contributed Systems LLC.
+
+If you cannot or do not want to reassign those rights (your employment
+contract for your employer may not allow this), you should not submit a PR.
+Open an issue and someone else can do the work.
+
+This is a legal way of saying "If you submit a PR to us, that code becomes ours".
+99.9% of the time that's what you intend anyways; we hope it doesn't scare you away from contributing!
 
-If you've got more money than time and want to sponsor Sidekiq's continued support, your company can buy [Sidekiq Pro](http://sidekiq.org/pro).  You get great functionality, I continue to fix bugs and enhance Sidekiq for years to come.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) Mike Perham
+Copyright (c) Contributed Systems LLC
 
 Sidekiq is an Open Source project licensed under the terms of
 the LGPLv3 license.  Please see <http://www.gnu.org/licenses/lgpl-3.0.html>

data/Pro-Changes.md

@@ -3,6 +3,12 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.
 
+1.7.5
+-----------
+
+- Fix job filtering within the Dead tab.
+
+
 1.7.4
 -----------
 

data/README.md

@@ -62,11 +62,9 @@ More Information
 
 Please see the [sidekiq wiki](https://github.com/mperham/sidekiq/wiki) for the official documentation.
 [#sidekiq on irc.freenode.net](irc://irc.freenode.net/#sidekiq) is dedicated to this project,
-but bug reports or feature requests suggestions should still go through [issues on Github](https://github.com/mperham/sidekiq/issues).  Release announcements are made to [@sidekiq](https://twitter.com/sidekiq)
+but bug reports or feature requests suggestions should still go through [issues on Github](https://github.com/mperham/sidekiq/issues).  Release announcements are made to the [@sidekiq](https://twitter.com/sidekiq) Twitter account.
 
-There's also a mailing list via [Librelist](http://librelist.org) that you can subscribe to by sending
-an email to <sidekiq@librelist.org> with a greeting in the body. To unsubscribe, send an email to <sidekiq-unsubscribe@librelist.org> and that's it!
-Once archiving begins, you'll be able to visit [the archives](http://librelist.com/browser/sidekiq/) to see past threads.
+You may also find useful a [Google Group](https://groups.google.com/forum/#!forum/sidekiq) dedicated to Sidekiq discussion and [a Sidekiq tag](https://stackoverflow.com/questions/tagged/sidekiq) on Stack Overflow.
 
 
 Problems?
@@ -94,4 +92,4 @@ Please see [LICENSE](https://github.com/mperham/sidekiq/blob/master/LICENSE) for
 Author
 -----------------
 
-Mike Perham, [@mperham](https://twitter.com/mperham) / [@sidekiq](https://twitter.com/sidekiq), [http://mikeperham.com](http://mikeperham.com)
+Mike Perham, [@mperham](https://twitter.com/mperham) / [@sidekiq](https://twitter.com/sidekiq), [http://mikeperham.com](http://mikeperham.com) / [http://www.contribsys.com](http://www.contribsys.com)

data/lib/sidekiq.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 require 'sidekiq/version'
+fail "Sidekiq #{Sidekiq::VERSION} does not support Ruby 1.9." if RUBY_PLATFORM != 'java' && RUBY_VERSION < '2.0.0'
+
 require 'sidekiq/logging'
 require 'sidekiq/client'
 require 'sidekiq/worker'
@@ -23,7 +25,7 @@ module Sidekiq
       :startup => [],
       :quiet => [],
       :shutdown => [],
-    },
+    }
   }
 
   def self.❨╯°□°❩╯︵┻━┻
@@ -66,7 +68,7 @@ module Sidekiq
   end
 
   def self.redis(&block)
-    raise ArgumentError, "requires a block" if !block
+    raise ArgumentError, "requires a block" unless block
     redis_pool.with(&block)
   end
 
@@ -143,8 +145,8 @@ module Sidekiq
   #     end
   #   end
   def self.on(event, &block)
-    raise ArgumentError, "Symbols only please: #{event}" if !event.is_a?(Symbol)
-    raise ArgumentError, "Invalid event name: #{event}" if !options[:lifecycle_events].keys.include?(event)
+    raise ArgumentError, "Symbols only please: #{event}" unless event.is_a?(Symbol)
+    raise ArgumentError, "Invalid event name: #{event}" unless options[:lifecycle_events].keys.include?(event)
     options[:lifecycle_events][event] << block
   end
 end

data/lib/sidekiq/api.rb

@@ -316,6 +316,23 @@ module Sidekiq
       end
     end
 
+    ##
+    # Place job in the dead set
+    def kill
+      raise 'Kill not available on jobs which have not failed' unless item['failed_at']
+      remove_job do |message|
+        Sidekiq.logger.info { "Killing job #{message['jid']}" }
+        now = Time.now.to_f
+        Sidekiq.redis do |conn|
+          conn.multi do
+            conn.zadd('dead', now, message)
+            conn.zremrangebyscore('dead', '-inf', now - DeadSet::DEAD_JOB_TIMEOUT)
+            conn.zremrangebyrank('dead', 0, - DeadSet::MAX_JOBS)
+          end
+        end
+      end
+    end
+
     private
 
     def remove_job
@@ -338,12 +355,13 @@ module Sidekiq
               false
             end
           end
-          message = hash[true].first
-          yield message
+
+          msg = hash.fetch(true, []).first
+          yield msg if msg
 
           # push the rest back onto the sorted set
           conn.multi do
-            hash[false].each do |message|
+            hash.fetch(false, []).each do |message|
               conn.zadd(parent.name, score.to_f.to_s, message)
             end
           end
@@ -498,7 +516,13 @@ module Sidekiq
     end
   end
 
+  ##
+  # Allows enumeration of dead jobs within Sidekiq.
+  #
   class DeadSet < JobSet
+    DEAD_JOB_TIMEOUT = 180 * 24 * 60 * 60 # 6 months
+    MAX_JOBS = 10_000
+
     def initialize
       super 'dead'
     end
@@ -577,6 +601,14 @@ module Sidekiq
       @attribs = hash
     end
 
+    def tag
+      self['tag']
+    end
+
+    def labels
+      Array(self['labels'])
+    end
+
     def [](key)
       @attribs[key]
     end

data/lib/sidekiq/launcher.rb

@@ -71,14 +71,10 @@ module Sidekiq
         'queues' => @options[:queues].uniq,
         'labels' => Sidekiq.options[:labels],
       }
-      Sidekiq.redis do |conn|
-        conn.multi do
-          conn.sadd('processes', key)
-          conn.hset(key, 'info', Sidekiq.dump_json(data))
-          conn.expire(key, 60)
-        end
-      end
-      manager.heartbeat(key, data)
+      # this data doesn't change so dump it to a string
+      # now so we don't need to dump it every heartbeat.
+      json = Sidekiq.dump_json(data)
+      manager.heartbeat(key, data, json)
     end
 
     def stop_heartbeat
@@ -89,5 +85,6 @@ module Sidekiq
         end
       end
     end
+
   end
 end

data/lib/sidekiq/manager.rb

@@ -132,26 +132,27 @@ module Sidekiq
       @threads[proxy_id] = thr
     end
 
-    def heartbeat(key, data)
+    def heartbeat(key, data, json)
       proctitle = ['sidekiq', Sidekiq::VERSION]
       proctitle << data['tag'] unless data['tag'].empty?
       proctitle << "[#{@busy.size} of #{data['concurrency']} busy]"
       proctitle << 'stopping' if stopped?
       $0 = proctitle.join(' ')
 
-      ❤(key)
+      ❤(key, json)
       after(5) do
-        heartbeat(key, data)
+        heartbeat(key, data, json)
       end
     end
 
     private
 
-    def ❤(key)
+    def ❤(key, json)
       begin
-        _, _, msg = Sidekiq.redis do |conn|
+        _, _, _, msg = Sidekiq.redis do |conn|
           conn.multi do
-            conn.hmset(key, 'busy', @busy.size, 'beat', Time.now.to_f)
+            conn.sadd('processes', key)
+            conn.hmset(key, 'info', json, 'busy', @busy.size, 'beat', Time.now.to_f)
             conn.expire(key, 60)
             conn.rpop("#{key}-signals")
           end

data/lib/sidekiq/middleware/server/retry_jobs.rb

@@ -6,21 +6,22 @@ module Sidekiq
       ##
       # Automatically retry jobs that fail in Sidekiq.
       # Sidekiq's retry support assumes a typical development lifecycle:
-      # 0. push some code changes with a bug in it
-      # 1. bug causes message processing to fail, sidekiq's middleware captures
-      #    the message and pushes it onto a retry queue
-      # 2. sidekiq retries messages in the retry queue multiple times with
-      #    an exponential delay, the message continues to fail
-      # 3. after a few days, a developer deploys a fix.  the message is
-      #    reprocessed successfully.
-      # 4. if 3 never happens, sidekiq will eventually give up and throw the
-      #    message away. If the worker defines a method called 'retries_exhausted',
-      #    this will be called before throwing the message away. If the
-      #    'retries_exhausted' method throws an exception, it's dropped and logged.
       #
-      # A message looks like:
+      #   0. push some code changes with a bug in it
+      #   1. bug causes job processing to fail, sidekiq's middleware captures
+      #      the job and pushes it onto a retry queue
+      #   2. sidekiq retries jobs in the retry queue multiple times with
+      #      an exponential delay, the job continues to fail
+      #   3. after a few days, a developer deploys a fix.  the job is
+      #      reprocessed successfully.
+      #   4. once retries are exhausted, sidekiq will give up and move the
+      #      job to the Dead Job Queue (aka morgue) where it must be dealt with
+      #      manually in the Web UI.
+      #   5. After 6 months on the DJQ, Sidekiq will discard the job.
       #
-      #     { 'class' => 'HardWorker', 'args' => [1, 2, 'foo'] }
+      # A job looks like:
+      #
+      #     { 'class' => 'HardWorker', 'args' => [1, 2, 'foo'], 'retry' => true }
       #
       # The 'retry' option also accepts a number (in place of 'true'):
       #
@@ -29,7 +30,7 @@ module Sidekiq
       # The job will be retried this number of times before giving up. (If simply
       # 'true', Sidekiq retries 25 times)
       #
-      # We'll add a bit more data to the message to support retries:
+      # We'll add a bit more data to the job to support retries:
       #
       #  * 'queue' - the queue to use
       #  * 'retry_count' - number of times we've retried so far.
@@ -37,18 +38,28 @@ module Sidekiq
       #  * 'error_class' - the exception class
       #  * 'failed_at' - the first time it failed
       #  * 'retried_at' - the last time it was retried
+      #  * 'backtrace' - the number of lines of error backtrace to store
       #
-      # We don't store the backtrace as that can add a lot of overhead
-      # to the message and everyone is using Airbrake, right?
+      # We don't store the backtrace by default as that can add a lot of overhead
+      # to the job and everyone is using an error service, right?
       #
-      # The default number of retry attempts is 25. You can pass a value for the
-      # number of retry attempts when adding the middleware using the options hash:
+      # The default number of retry attempts is 25 which works out to about 3 weeks
+      # of retries. You can pass a value for the max number of retry attempts when
+      # adding the middleware using the options hash:
       #
       #   Sidekiq.configure_server do |config|
       #     config.server_middleware do |chain|
       #       chain.add Middleware::Server::RetryJobs, :max_retries => 7
       #     end
       #   end
+      #
+      # or limit the number of retries for a particular worker with:
+      #
+      #    class MyWorker
+      #      include Sidekiq::Worker
+      #      sidekiq_options :retry => 10
+      #    end
+      #
       class RetryJobs
         include Sidekiq::Util
 
@@ -75,7 +86,7 @@ module Sidekiq
           else
             queue
           end
-          msg['error_message'] = e.message
+          msg['error_message'] = e.message[0..10_000]
           msg['error_class'] = e.class.name
           count = if msg['retry_count']
             msg['retried_at'] = Time.now.to_f
@@ -134,8 +145,8 @@ module Sidekiq
           Sidekiq.redis do |conn|
             conn.multi do
               conn.zadd('dead', now, payload)
-              conn.zremrangebyscore('dead', '-inf', now - DEAD_JOB_TIMEOUT)
-              conn.zremrangebyrank('dead', 0, -MAX_JOBS)
+              conn.zremrangebyscore('dead', '-inf', now - DeadSet::DEAD_JOB_TIMEOUT)
+              conn.zremrangebyrank('dead', 0, -DeadSet::MAX_JOBS)
             end
           end
         end

data/lib/sidekiq/scheduled.rb

@@ -51,7 +51,10 @@ module Sidekiq
             logger.error ex.backtrace.first
           end
 
-          after(poll_interval * rand) { poll }
+          # Randomizing scales the interval by half since
+          # on average calling `rand` returns 0.5.
+          # We make up for this by doubling the interval
+          after(poll_interval * 2 * rand) { poll }
         end
       end
 
@@ -73,7 +76,7 @@ module Sidekiq
       def poll_interval
         Sidekiq.options[:poll_interval] ||= begin
           pcount = Sidekiq.redis {|c| c.scard('processes') } || 1
-          pcount * 15 * 2
+          pcount * 15
         end
       end
 

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "3.2.1"
+  VERSION = "3.2.2"
 end

data/lib/sidekiq/web.rb

@@ -36,6 +36,8 @@ module Sidekiq
         @custom_tabs ||= {}
       end
       alias_method :tabs, :custom_tabs
+
+      attr_accessor :app_url
     end
 
     get "/busy" do
@@ -100,7 +102,7 @@ module Sidekiq
 
       params['key'].each do |key|
         job = Sidekiq::DeadSet.new.fetch(*parse_params(key)).first
-        retry_or_delete job, params if job
+        retry_or_delete_or_kill job, params if job
       end
       redirect_with_query("#{root_path}morgue")
     end
@@ -118,7 +120,7 @@ module Sidekiq
     post "/morgue/:key" do
       halt 404 unless params['key']
       job = Sidekiq::DeadSet.new.fetch(*parse_params(params['key'])).first
-      retry_or_delete job, params if job
+      retry_or_delete_or_kill job, params if job
       redirect_with_query("#{root_path}morgue")
     end
 
@@ -142,7 +144,7 @@ module Sidekiq
 
       params['key'].each do |key|
         job = Sidekiq::RetrySet.new.fetch(*parse_params(key)).first
-        retry_or_delete job, params if job
+        retry_or_delete_or_kill job, params if job
       end
       redirect_with_query("#{root_path}retries")
     end
@@ -160,7 +162,7 @@ module Sidekiq
     post "/retries/:key" do
       halt 404 unless params['key']
       job = Sidekiq::RetrySet.new.fetch(*parse_params(params['key'])).first
-      retry_or_delete job, params if job
+      retry_or_delete_or_kill job, params if job
       redirect_with_query("#{root_path}retries")
     end
 
@@ -196,7 +198,7 @@ module Sidekiq
     end
 
     get '/' do
-      @redis_info = Sidekiq.redis { |conn| conn.info }.select{ |k, v| REDIS_KEYS.include? k }
+      @redis_info = redis_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
@@ -208,7 +210,7 @@ module Sidekiq
     get '/dashboard/stats' do
       sidekiq_stats = Sidekiq::Stats.new
       queue         = Sidekiq::Queue.new
-      redis_stats   = Sidekiq.redis { |conn| conn.info }.select{ |k, v| REDIS_KEYS.include? k }
+      redis_stats   = redis_info.select{ |k, v| REDIS_KEYS.include? k }
 
       content_type :json
       Sidekiq.dump_json({
@@ -227,11 +229,13 @@ module Sidekiq
 
     private
 
-    def retry_or_delete job, params
+    def retry_or_delete_or_kill job, params
       if params['retry']
         job.retry
       elsif params['delete']
         job.delete
+      elsif params['kill']
+        job.kill
       end
     end
 

data/lib/sidekiq/web_helpers.rb

@@ -68,6 +68,18 @@ module Sidekiq
       @@ns ||= Sidekiq.redis {|conn| conn.respond_to?(:namespace) ? conn.namespace : nil }
     end
 
+    def redis_info
+      Sidekiq.redis do |conn|
+        # admin commands can't go through redis-namespace starting
+        # in redis-namespace 2.0
+        if conn.respond_to?(:namespace)
+          conn.redis.info
+        else
+          conn.info
+        end
+      end
+    end
+
     def root_path
       "#{env['SCRIPT_NAME']}/"
     end

data/test/test_manager.rb

@@ -104,7 +104,7 @@ class TestManager < Sidekiq::Test
 
       describe 'when manager is active' do
         before do
-          @mgr.heartbeat('identity', heartbeat_data)
+          @mgr.heartbeat('identity', heartbeat_data, Sidekiq.dump_json(heartbeat_data))
         end
 
         it 'sets useful info to proctitle' do
@@ -126,7 +126,7 @@ class TestManager < Sidekiq::Test
 
           @mgr.stop
           @mgr.processor_done(@processor)
-          @mgr.heartbeat('identity', heartbeat_data)
+          @mgr.heartbeat('identity', heartbeat_data, Sidekiq.dump_json(heartbeat_data))
 
           @processor.verify
         end

data/test/test_web.rb

@@ -173,6 +173,17 @@ class TestWeb < Sidekiq::Test
       assert_match(/#{params.first['args'][2]}/, last_response.body)
     end
 
+    it 'can kill a single retry now' do
+      params = add_retry
+      post "/retries/#{job_params(*params)}", 'kill' => 'Kill'
+      assert_equal 302, last_response.status
+      assert_equal 'http://example.org/retries', last_response.header['Location']
+
+      get '/morgue'
+      assert_equal 200, last_response.status
+      assert_match(/#{params.first['args'][2]}/, last_response.body)
+    end
+
     it 'can display scheduled' do
       get '/scheduled'
       assert_equal 200, last_response.status

data/web/assets/stylesheets/application.css

@@ -102,7 +102,7 @@ header.row .pagination {
   border-width: 0;
 }
 .poll-wrapper {
-  margin: 9px 0;
+    margin: 9px;
 }
 .nav #live-poll {
   height: 25px;
@@ -604,10 +604,6 @@ div.interval-slider input {
 }
 
 @media (max-width: 768px) {
-  .navbar .container {
-    text-align: center
-  }
-
   .navbar .navbar-brand {
     float: none;
     display: block;
@@ -629,7 +625,13 @@ div.interval-slider input {
   }
 
   .poll-wrapper {
-    margin: 0 9px 9px;
+    width: 100%;
+    text-align: center;
+  }
+
+  .poll-wrapper > a {
+    display: inline-block;
+    margin: 5px;
   }
 
   .navbar.navbar-fixed-bottom ul {

data/web/locales/de.yml

@@ -33,6 +33,7 @@ de:
   NextRetry: Nächster Versuch
   RetryCount: Anzahl der Versuche
   RetryNow: Jetzt erneut versuchen
+  Kill: Töten
   LastRetry: Letzter Versuch
   OriginallyFailed: Ursprünglich fehlgeschlagen
   AreYouSure: Bist du sicher?

data/web/locales/en.yml

@@ -33,6 +33,7 @@ en: # <---- change this to your locale code
   NextRetry: Next Retry
   RetryCount: Retry Count
   RetryNow: Retry Now
+  Kill: Kill
   LastRetry: Last Retry
   OriginallyFailed: Originally Failed
   AreYouSure: Are you sure?

data/web/locales/es.yml

@@ -33,6 +33,7 @@ es:
   NextRetry: Siguiente Intento
   RetryCount: Numero de Reintentos
   RetryNow: Reintentar Ahora
+  Kill: Matar
   LastRetry: Último Reintento
   OriginallyFailed: Falló Originalmente
   AreYouSure: ¿Estás seguro?

data/web/locales/fr.yml

@@ -33,6 +33,7 @@ fr:
   NextRetry: Prochain essai
   RetryCount: Nombre d'essais
   RetryNow: Réessayer maintenant
+  Kill: Tuer
   LastRetry: Dernier essai
   OriginallyFailed: Échec originel
   AreYouSure: Êtes-vous certain ?

data/web/locales/it.yml

@@ -33,6 +33,7 @@ it:
   NextRetry: Prossimo tentativo
   RetryCount: Totale tentativi
   RetryNow: Riprova
+  Kill: Uccidere
   LastRetry: Ultimo tentativo
   OriginallyFailed: Primo fallimento
   AreYouSure: Sei sicuro?

data/web/locales/ru.yml

@@ -32,6 +32,7 @@ ru:
   NextRetry: Следующая попытка
   RetryCount: Кол-во попыток
   RetryNow: Повторить сейчас
+  Kill: Убиваем
   LastRetry: Последняя попытка
   OriginallyFailed: Первый провал
   AreYouSure: Вы уверены?

data/web/views/_footer.erb

@@ -0,0 +1,22 @@
+<div class="navbar navbar-fixed-bottom navbar-inverse">
+  <div class="navbar-inner">
+    <div class="container text-center">
+        <ul class="nav">
+          <li>
+            <p class="navbar-text" style="color:white;">Sidekiq v<%= Sidekiq::VERSION %></p>
+          </li>
+          <li>
+            <p class="navbar-text">Redis: <%= redis_connection %></p>
+          </li>
+          <li>
+            <p class="navbar-text"><%= t('Time') %>: <%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
+          </li>
+          <% if namespace %>
+              <li>
+                <p class="navbar-text"><%= t('Namespace') %>: <%= namespace %></p>
+              </li>
+          <% end %>
+        </ul>
+    </div>
+  </div>
+</div>

data/web/views/_nav.erb

@@ -1,30 +1,34 @@
-<div class="navbar-inner">
-  <div class="container">
-    <a class="navbar-brand" href="<%= root_path %>">
-      <%= Sidekiq::NAME %>
-      <%= erb :_status %>
-    </a>
-    <ul class="nav navbar-nav">
-      <% Sidekiq::Web.default_tabs.each do |title, url| %>
-        <% if url == '' %>
-          <li class="<%= current_path == url ? 'active' : '' %>">
-            <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
-          </li>
-        <% else %>
-          <li class="<%= current_path.start_with?(url) ? 'active' : '' %>">
-            <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
-          </li>
-        <% end %>
-      <% end %>
-      <% Sidekiq::Web.custom_tabs.each do |title, url| %>
-        <li class="<%= current_path.start_with?(url) ? 'active' : '' %>">
-          <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
-        </li>
-      <% end %>
-    </ul>
-
+<div class="navbar navbar-default navbar-fixed-top">
+  <div class="navbar-inner">
+    <div class="container-fluid text-center">
+        <a class="navbar-brand" href="<%= root_path %>">
+          <%= Sidekiq::NAME %>
+          <%= erb :_status %>
+        </a>
+        <ul class="nav navbar-nav">
+          <% Sidekiq::Web.default_tabs.each do |title, url| %>
+              <% if url == '' %>
+                  <li class="<%= current_path == url ? 'active' : '' %>">
+                    <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
+                  </li>
+              <% else %>
+                  <li class="<%= current_path.start_with?(url) ? 'active' : '' %>">
+                    <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
+                  </li>
+              <% end %>
+          <% end %>
+          <% Sidekiq::Web.custom_tabs.each do |title, url| %>
+              <li class="<%= current_path.start_with?(url) ? 'active' : '' %>">
+                <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
+              </li>
+          <% end %>
+        </ul>
+    </div>
     <div class="poll-wrapper pull-right">
-      <%= erb :_poll %>
+        <%= erb :_poll %>
+        <% if Sidekiq::Web.app_url %>
+            <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
+        <% end %>
     </div>
   </div>
 </div>

data/web/views/_poll.erb

@@ -1,10 +1,8 @@
-<% if params[:poll] %>
-  <script>
-    setInterval("window.location.reload(true)", parseInt(localStorage.timeInterval) || 2000);
-  </script>
-<% end %>
-<% unless current_path == '' %>
+<% if current_path != '' %>
   <% if params[:poll] %>
+    <script>
+        setInterval("window.location.reload(true)", parseInt(localStorage.timeInterval) || 2000);
+    </script>
     <a id="live-poll" class="btn btn-primary active" href="<%= root_path %><%= current_path %>"><%= t('StopPolling') %></a>
   <% else %>
     <a id="live-poll" class="btn btn-primary" href="<%= root_path %><%= current_path %>?<%= qparams(poll: true) %>"><%= t('LivePoll') %></a>

data/web/views/busy.erb

@@ -21,11 +21,12 @@
     <th><%= t('Busy') %></th>
     <th>&nbsp;</th>
   </thead>
-  <% Sidekiq::ProcessSet.new.each_with_index do |process, index| %>
+  <% Sidekiq::ProcessSet.new.each do |process| %>
     <tr>
       <td>
         <%= "#{process['hostname']}:#{process['pid']}" %>
-        <% Array(process['labels']).each do |label| %>
+        <span class="label label-success"><%= process.tag %></span>
+        <% process.labels.each do |label| %>
           <span class="label label-info"><%= label %></span>
         <% end %>
       </td>

data/web/views/dashboard.erb

@@ -15,18 +15,23 @@
   </div>
 </div>
 
-<div id="realtime" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>"></div>
-<div id="realtime-legend"></div>
+<div class="row">
+  <div id="realtime" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>"></div>
+  <div id="realtime-legend"></div>
+</div>
+
+<div class="row">
+  <h5>
+    <span class="history-heading"><%= t('History') %></span>
+    <a href="<%= root_path %>?days=7" class="history-graph <%= "active" if params[:days] == "7" %>"><%= t('OneWeek') %></a>
+    <a href="<%= root_path %>" class="history-graph <%= "active" if params[:days].nil? || params[:days] == "30" %>"><%= t('OneMonth') %></a>
+    <a href="<%= root_path %>?days=90" class="history-graph <%= "active" if params[:days] == "90" %>"><%= t('ThreeMonths') %></a>
+    <a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
+  </h5>
 
-<h5>
-  <span class="history-heading"><%= t('History') %></span>
-  <a href="<%= root_path %>?days=7" class="history-graph <%= "active" if params[:days] == "7" %>"><%= t('OneWeek') %></a>
-  <a href="<%= root_path %>" class="history-graph <%= "active" if params[:days].nil? || params[:days] == "30" %>" ><%= t('OneMonth') %></a>
-  <a href="<%= root_path %>?days=90" class="history-graph <%= "active" if params[:days] == "90" %>"><%= t('ThreeMonths') %></a>
-  <a href="<%= root_path %>?days=180" class="history-graph <%= "active" if params[:days] == "180" %>"><%= t('SixMonths') %></a>
-</h5>
-<div id="history" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>dashboard/stats"></div>
-<div id="history-legend"></div>
+  <div id="history" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>" data-processed="<%= h Sidekiq.dump_json(@processed_history) %>" data-failed="<%= h Sidekiq.dump_json(@failed_history) %>" data-update-url="<%= root_path %>dashboard/stats"></div>
+  <div id="history-legend"></div>
+</div>
 
 <br/>
 <h5>Redis</h5>

data/web/views/layout.erb

@@ -7,13 +7,10 @@
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
     <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
     <script type="text/javascript" src="<%= root_path %>javascripts/locales/jquery.timeago.<%= locale %>.js"></script>
-    <meta name="google" value="notranslate" />
+    <meta name="google" content="notranslate" />
   </head>
   <body class="admin">
-    <div class="navbar navbar-default navbar-fixed-top">
-      <%= erb :_nav %>
-    </div>
-
+    <%= erb :_nav %>
     <div id="page">
       <div class="container">
         <div class="row">
@@ -27,28 +24,6 @@
         </div>
       </div>
     </div>
-
-    <div class="navbar navbar-fixed-bottom navbar-inverse">
-      <div class="navbar-inner">
-        <div class="container">
-          <ul class="nav">
-            <li>
-              <p class="navbar-text" style="color:white;">Sidekiq v<%= Sidekiq::VERSION %></p>
-            </li>
-            <li>
-              <p class="navbar-text">Redis: <%= redis_connection %></p>
-            </li>
-            <li>
-              <p class="navbar-text"><%= t('Time') %>: <%= Time.now.utc.strftime('%H:%M:%S UTC') %></p>
-            </li>
-            <% if namespace %>
-              <li>
-                <p class="navbar-text"><%= t('Namespace') %>: <%= namespace %></p>
-              </li>
-            <% end %>
-          </ul>
-        </div>
-      </div>
-    </div>
+    <%=  erb :_footer %>
   </body>
 </html>

data/web/views/retries.erb

@@ -54,6 +54,7 @@
     </table>
     <input class="btn btn-primary btn-xs pull-left" type="submit" name="retry" value="<%= t('RetryNow') %>" />
     <input class="btn btn-danger btn-xs pull-left" type="submit" name="delete" value="<%= t('Delete') %>" />
+    <input class="btn btn-danger btn-xs pull-left" type="submit" name="kill" value="<%= t('Kill') %>" />
   </form>
 
   <form action="<%= root_path %>retries/all/delete" method="post">

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -302,6 +302,7 @@ files:
 - web/locales/sv.yml
 - web/locales/zh-cn.yml
 - web/locales/zh-tw.yml
+- web/views/_footer.erb
 - web/views/_job_info.erb
 - web/views/_nav.erb
 - web/views/_paging.erb