sidekiq 3.3.3 → 3.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4895c316f5c9f592745594ac4984e150fbf5ea62
-  data.tar.gz: b78f6b9242d8a981a60d3fbe28a08c3c16b839af
+  metadata.gz: a6ca011daf81025502d9f9abfdf4e38fafd05d83
+  data.tar.gz: 3687865623e0ad65b98fcd7e5e576f540d80df23
 SHA512:
-  metadata.gz: 9134b87eee18dc46b1e95d9190ee3a3f0d5b9426f5b6953d9b55aee39d9fd6e2441b9133fa797e137d8cfdc50c6e99fbff1c74195fe065ff3d84b4e8869333fe
-  data.tar.gz: 23767242d2d5911526cae5b5061d050a363947cc9f21f7dbc336eb6d5605ab470a0733b2ab6979e33b3dd81969bdd282958ce69f8a6a3a4683fdceb71dfcc4a1
+  metadata.gz: 87bf6bf803ce2c24d2c424348fe83681c77dafda7206300c13ebda6c9aca5d36d1551642c68a0d2f37558540a64e8bd5aa5cfb6d95baaa7ce1fd08d62000ffdb
+  data.tar.gz: ddf4ccef0e503b5e59b874d8ec14ecb6d94721cf674f19385cb0a6e3d180c3605da63b03bb4752fd11c4da60be2d41f63f08c2f2a413e623d15bd929bc9210ff

data/Changes.md

@@ -1,3 +1,16 @@
+3.3.4
+-----------
+
+- **Improved ActiveJob integration** - Web UI now shows ActiveJobs in a
+  nicer format and job logging shows the actual class name, requires
+  Rails 4.2.2+ [#2248, #2259]
+- Add Sidekiq::Process#dump\_threads API to trigger TTIN output [#2247]
+- Web UI polling now uses Ajax to avoid page reload [#2266, davydovanton]
+- Several Web UI styling improvements [davydovanton]
+- Add Tamil, Hindi translations for Web UI [ferdinandrosario, tejasbubane]
+- Fix Web UI to work with country-specific locales [#2243]
+- Handle circular error causes [#2285,  eugenk]
+
 3.3.3
 -----------
 

data/Pro-Changes.md

@@ -3,6 +3,18 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.
 
+2.0.2
+-----------
+
+- Multiple Web UIs can now run in the same process. [#2267] If you have
+  multiple Redis shards, you can mount UIs for all in the same process:
+```ruby
+POOL1 = ConnectionPool.new { Redis.new(:url => "redis://localhost:6379/0") }
+POOL2 = ConnectionPool.new { Redis.new(:url => "redis://localhost:6378/0") }
+
+mount Sidekiq::Pro::Web.with(redis_pool: POOL1) => '/sidekiq1'
+mount Sidekiq::Pro::Web.with(redis_pool: POOL2) => '/sidekiq2'
+```
 
 2.0.1
 -----------

data/lib/sidekiq.rb

@@ -30,6 +30,11 @@ module Sidekiq
     dead_timeout_in_seconds: 180 * 24 * 60 * 60 # 6 months
   }
 
+  DEFAULT_WORKER_OPTIONS = {
+    'retry' => true,
+    'queue' => 'default'
+  }
+
   def self.❨╯°□°❩╯︵┻━┻
     puts "Calm down, bro"
   end
@@ -103,7 +108,7 @@ module Sidekiq
   end
 
   def self.default_worker_options
-    defined?(@default_worker_options) ? @default_worker_options : { 'retry' => true, 'queue' => 'default' }
+    defined?(@default_worker_options) ? @default_worker_options : DEFAULT_WORKER_OPTIONS
   end
 
   def self.load_json(string)

data/lib/sidekiq/api.rb

@@ -283,7 +283,7 @@ module Sidekiq
                      "#{target}.#{method}"
                    end
                  when "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"
-                   args[0]
+                   @item['wrapped'] || args[0]
                  else
                    klass
                  end
@@ -297,7 +297,7 @@ module Sidekiq
                     arg
                   end
                 when "ActiveJob::QueueAdapters::SidekiqAdapter::JobWrapper"
-                  args[1..-1]
+                  @item['wrapped'] ? args[0]["arguments"] : []
                 else
                   args
                 end
@@ -384,7 +384,7 @@ module Sidekiq
       raise "Retry not available on jobs which have not failed" unless item["failed_at"]
       remove_job do |message|
         msg = Sidekiq.load_json(message)
-        msg['retry_count'] = msg['retry_count'] - 1
+        msg['retry_count'] -= 1
         Sidekiq::Client.push(msg)
       end
     end
@@ -721,6 +721,10 @@ module Sidekiq
       signal('TERM')
     end
 
+    def dump_threads
+      signal('TTIN')
+    end
+
     private
 
     def signal(sig)
@@ -785,13 +789,15 @@ module Sidekiq
     def size
       Sidekiq.redis do |conn|
         procs = conn.smembers('processes')
-        return 0 if procs.empty?
-
-        conn.pipelined do
-          procs.each do |key|
-            conn.hget(key, 'busy')
-          end
-        end.map(&:to_i).inject(:+)
+        if procs.empty?
+          0
+        else
+          conn.pipelined do
+            procs.each do |key|
+              conn.hget(key, 'busy')
+            end
+          end.map(&:to_i).inject(:+)
+        end
       end
     end
   end

data/lib/sidekiq/client.rb

@@ -211,19 +211,23 @@ module Sidekiq
       raise(ArgumentError, "Message args must be an Array") unless item['args'].is_a?(Array)
       raise(ArgumentError, "Message class must be either a Class or String representation of the class name") unless item['class'].is_a?(Class) || item['class'].is_a?(String)
 
-      if item['class'].is_a?(Class)
-        raise(ArgumentError, "Message must include a Sidekiq::Worker class, not class name: #{item['class'].ancestors.inspect}") if !item['class'].respond_to?('get_sidekiq_options')
-        normalized_item = item['class'].get_sidekiq_options.merge(item)
-        normalized_item['class'] = normalized_item['class'].to_s
+      normalized_hash(item['class'.freeze])
+        .each{ |key, value| item[key] = value if item[key].nil? }
+
+      item['class'.freeze] = item['class'.freeze].to_s
+      item['queue'.freeze] = item['queue'.freeze].to_s
+      item['jid'.freeze] ||= SecureRandom.hex(12)
+      item['enqueued_at'.freeze] ||= Time.now.to_f
+      item
+    end
+
+    def normalized_hash(item_class)
+      if item_class.is_a?(Class)
+        raise(ArgumentError, "Message must include a Sidekiq::Worker class, not class name: #{item_class.ancestors.inspect}") if !item_class.respond_to?('get_sidekiq_options'.freeze)
+        item_class.get_sidekiq_options
       else
-        normalized_item = Sidekiq.default_worker_options.merge(item)
+        Sidekiq.default_worker_options
       end
-
-      normalized_item['queue'] = normalized_item['queue'].to_s
-      normalized_item['jid'] ||= SecureRandom.hex(12)
-      normalized_item['enqueued_at'] ||= Time.now.to_f
-      normalized_item
     end
-
   end
 end

data/lib/sidekiq/fetch.rb

@@ -35,7 +35,7 @@ module Sidekiq
 
         begin
           work = @strategy.retrieve_work
-          ::Sidekiq.logger.info("Redis is online, #{Time.now.to_f - @down.to_f} sec downtime") if @down
+          ::Sidekiq.logger.info("Redis is online, #{Time.now - @down} sec downtime") if @down
           @down = nil
 
           if work

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

@@ -4,7 +4,11 @@ module Sidekiq
       class Logging
 
         def call(worker, item, queue)
-          Sidekiq::Logging.with_context("#{worker.class.to_s} JID-#{item['jid']}#{" BID-#{item['bid']}" if item['bid']}") do
+          # If we're using a wrapper class, like ActiveJob, use the "wrapped"
+          # attribute to expose the underlying thing.
+          klass = item['wrapped'] || worker.class.to_s
+
+          Sidekiq::Logging.with_context("#{klass} JID-#{item['jid']}#{" BID-#{item['bid']}" if item['bid']}") do
             begin
               start = Time.now
               logger.info { "start" }
@@ -18,7 +22,7 @@ module Sidekiq
         end
 
         def elapsed(start)
-          (Time.now - start).to_f.round(3)
+          (Time.now - start).round(3)
         end
 
         def logger

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

@@ -188,12 +188,16 @@ module Sidekiq
           end
         end
 
-        def exception_caused_by_shutdown?(e)
+        def exception_caused_by_shutdown?(e, checked_causes = [])
           # In Ruby 2.1.0 only, check if exception is a result of shutdown.
           return false unless defined?(e.cause)
 
+          # Handle circular causes
+          checked_causes << e.object_id
+          return false if checked_causes.include?(e.cause.object_id)
+
           e.cause.instance_of?(Sidekiq::Shutdown) ||
-            exception_caused_by_shutdown?(e.cause)
+            exception_caused_by_shutdown?(e.cause, checked_causes)
         end
 
       end

data/lib/sidekiq/paginator.rb

@@ -1,5 +1,6 @@
 module Sidekiq
   module Paginator
+
     def page(key, pageidx=1, page_size=25, opts=nil)
       current_page = pageidx.to_i < 1 ? 1 : pageidx.to_i
       pageidx = current_page - 1
@@ -22,19 +23,20 @@ module Sidekiq
               conn.zrange(key, starting, ending, :with_scores => true)
             end
           end
+          [current_page, total_size, items]
         when 'list'
           total_size, items = conn.multi do
             conn.llen(key)
             conn.lrange(key, starting, ending)
           end
+          [current_page, total_size, items]
         when 'none'
-          return [1, 0, []]
+          [1, 0, []]
         else
           raise "can't page a #{type}"
         end
       end
-
-      [current_page, total_size, items]
     end
+
   end
 end

data/lib/sidekiq/redis_connection.rb

@@ -7,10 +7,7 @@ module Sidekiq
     class << self
 
       def create(options={})
-        url = options[:url] || determine_redis_provider
-        if url
-          options[:url] = url
-        end
+        options[:url] ||= determine_redis_provider
 
         # need a connection for Fetcher and Retry
         size = options[:size] || (Sidekiq.server? ? (Sidekiq.options[:concurrency] + 2) : 5)

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "3.3.3"
+  VERSION = "3.3.4"
 end

data/lib/sidekiq/web_helpers.rb

@@ -3,30 +3,77 @@ require 'uri'
 module Sidekiq
   # This is not a public API
   module WebHelpers
-    def strings
-      @@strings ||= begin
+    def strings(lang)
+      @@strings ||= {}
+      @@strings[lang] ||= begin
         # Allow sidekiq-web extensions to add locale paths
         # so extensions can be localized
-        settings.locales.each_with_object({}) do |path,global|
-          Dir["#{path}/*.yml"].each_with_object(global) do |file,hash|
+        settings.locales.each_with_object({}) do |path, global|
+          find_locale_files(lang).each do |file|
             strs = YAML.load(File.open(file))
-            hash.deep_merge!(strs)
+            global.deep_merge!(strs[lang])
           end
         end
       end
     end
 
+    def locale_files
+      @@locale_files = settings.locales.flat_map do |path|
+        Dir["#{path}/*.yml"]
+      end
+    end
+
+    def find_locale_files(lang)
+      locale_files.select { |file| file =~ /\/#{lang}\.yml$/ }
+    end
+
     # This is a hook for a Sidekiq Pro feature.  Please don't touch.
     def filtering(*)
     end
 
+    # This view helper provide ability display you html code in
+    # to head of page. Example:
+    #
+    #   <% add_to_head do %>
+    #     <link rel="stylesheet" .../>
+    #     <meta .../>
+    #   <% end %>
+    #
+    def add_to_head(&block)
+      @head_html ||= []
+      @head_html << block if block_given?
+    end
+
+    def display_custom_head
+      return unless @head_html
+      @head_html.map { |block| capture(&block) }.join
+    end
+
+    # Simple capture method for erb templates. The origin was
+    # capture method from sinatra-contrib library.
+    def capture(&block)
+      block.call
+      eval('', block.binding)
+    end
+
+    # Given a browser request Accept-Language header like
+    # "fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4,ru;q=0.2", this function
+    # will return "fr" since that's the first code with a matching
+    # locale in web/locales
     def locale
-      lang = (request.env["HTTP_ACCEPT_LANGUAGE"] || 'en').split(',')[0].downcase
-      strings[lang] ? lang : 'en'
+      @locale ||= begin
+        locale = 'en'.freeze
+        languages = request.env['HTTP_ACCEPT_LANGUAGE'.freeze] || 'en'.freeze
+        languages.downcase.split(','.freeze).each do |lang|
+          lang = lang.split(';'.freeze)[0]
+          break locale = lang if find_locale_files(lang).any?
+        end
+        locale
+      end
     end
 
     def get_locale
-      strings[locale]
+      strings(locale)
     end
 
     def t(msg, options={})
@@ -129,7 +176,7 @@ module Sidekiq
     RETRY_JOB_KEYS = Set.new(%w(
       queue class args retry_count retried_at failed_at
       jid error_message error_class backtrace
-      error_backtrace enqueued_at retry
+      error_backtrace enqueued_at retry wrapped
     ))
 
     def retry_extra_items(retry_job)

data/lib/sidekiq/worker.rb

@@ -64,7 +64,7 @@ module Sidekiq
       #      can be true, false or an integer number of lines to save, default *false*
       #   :pool - use the given Redis connection pool to push this type of job to a given shard.
       def sidekiq_options(opts={})
-        self.sidekiq_options_hash = get_sidekiq_options.merge((opts || {}).stringify_keys)
+        self.sidekiq_options_hash = get_sidekiq_options.merge(opts.stringify_keys)
       end
 
       def sidekiq_retry_in(&block)

data/test/test_retry.rb

@@ -328,6 +328,46 @@ class TestRetry < Sidekiq::Test
                      File.read(@tmp_log_path), 'Log entry missing for sidekiq_retry_in')
       end
     end
+
+    describe 'handles errors withouth cause' do
+      before do
+        @error = nil
+        begin
+          raise ::StandardError, 'Error'
+        rescue ::StandardError => e
+          @error = e
+        end
+      end
+
+      it "does not recurse infinitely checking if it's a shutdown" do
+        assert(!Sidekiq::Middleware::Server::RetryJobs.new.send(
+          :exception_caused_by_shutdown?, @error))
+      end
+    end
+
+    describe 'handles errors with circular causes' do
+      before do
+        @error = nil
+        begin
+          begin
+            raise ::StandardError, 'Error 1'
+          rescue ::StandardError => e1
+            begin
+              raise ::StandardError, 'Error 2'
+            rescue ::StandardError => e2
+              raise e1
+            end
+          end
+        rescue ::StandardError => e
+          @error = e
+        end
+      end
+
+      it "does not recurse infinitely checking if it's a shutdown" do
+        assert(!Sidekiq::Middleware::Server::RetryJobs.new.send(
+          :exception_caused_by_shutdown?, @error))
+      end
+    end
   end
 
 end

data/test/test_web.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require_relative 'helper'
 require 'sidekiq'
 require 'sidekiq/web'
@@ -29,6 +30,18 @@ class TestWeb < Sidekiq::Test
       end
     end
 
+    it 'can show text with any locales' do
+      rackenv = {'HTTP_ACCEPT_LANGUAGE' => 'ru,en'}
+      get '/', {}, rackenv
+      assert_match(/Панель управления/, last_response.body)
+      rackenv = {'HTTP_ACCEPT_LANGUAGE' => 'es,en'}
+      get '/', {}, rackenv
+      assert_match(/Panel de Control/, last_response.body)
+      rackenv = {'HTTP_ACCEPT_LANGUAGE' => 'en-us'}
+      get '/', {}, rackenv
+      assert_match(/Dashboard/, last_response.body)
+    end
+
     describe 'busy' do
 
       it 'can display workers' do

data/test/test_web_helpers.rb

@@ -0,0 +1,46 @@
+require_relative 'helper'
+require 'sidekiq'
+require 'sidekiq/web_helpers'
+
+class TestWebHelpers < Sidekiq::Test
+
+  class Helpers
+    include Sidekiq::WebHelpers
+
+    def initialize(params={})
+      @thehash = default.merge(params)
+    end
+
+    def request
+      self
+    end
+
+    def settings
+      self
+    end
+
+    def locales
+      ['web/locales']
+    end
+
+    def env
+      @thehash
+    end
+
+    def default
+      {
+      }
+    end
+  end
+
+  def test_locale_determination
+    obj = Helpers.new
+    assert_equal 'en', obj.locale
+
+    obj = Helpers.new('HTTP_ACCEPT_LANGUAGE' => 'fr-FR,fr;q=0.8,en-US;q=0.6,en;q=0.4,ru;q=0.2')
+    assert_equal 'fr', obj.locale
+
+    obj = Helpers.new('HTTP_ACCEPT_LANGUAGE' => 'zh-CN,zh;q=0.8,en-US;q=0.6,en;q=0.4,ru;q=0.2')
+    assert_equal 'zh-cn', obj.locale
+  end
+end

data/web/assets/javascripts/application.js

@@ -18,6 +18,15 @@
  */
 (function(e){function n(){var t=r(this);if(!isNaN(t.datetime)){e(this).text(i(t.datetime))}return this}function r(n){n=e(n);if(!n.data("timeago")){n.data("timeago",{datetime:t.datetime(n)});var r=e.trim(n.text());if(r.length>0&&!(t.isTime(n)&&n.attr("title"))){n.attr("title",r)}}return n.data("timeago")}function i(e){return t.inWords(s(e))}function s(e){return(new Date).getTime()-e.getTime()}e.timeago=function(t){if(t instanceof Date){return i(t)}else if(typeof t==="string"){return i(e.timeago.parse(t))}else if(typeof t==="number"){return i(new Date(t))}else{return i(e.timeago.datetime(t))}};var t=e.timeago;e.extend(e.timeago,{settings:{refreshMillis:6e4,allowFuture:false,strings:{prefixAgo:null,prefixFromNow:null,suffixAgo:"ago",suffixFromNow:"from now",seconds:"less than a minute",minute:"about a minute",minutes:"%d minutes",hour:"about an hour",hours:"about %d hours",day:"a day",days:"%d days",month:"about a month",months:"%d months",year:"about a year",years:"%d years",wordSeparator:" ",numbers:[]}},inWords:function(t){function l(r,i){var s=e.isFunction(r)?r(i,t):r;var o=n.numbers&&n.numbers[i]||i;return s.replace(/%d/i,o)}var n=this.settings.strings;var r=n.prefixAgo;var i=n.suffixAgo;if(this.settings.allowFuture){if(t<0){r=n.prefixFromNow;i=n.suffixFromNow}}var s=Math.abs(t)/1e3;var o=s/60;var u=o/60;var a=u/24;var f=a/365;var c=s<45&&l(n.seconds,Math.round(s))||s<90&&l(n.minute,1)||o<45&&l(n.minutes,Math.round(o))||o<90&&l(n.hour,1)||u<24&&l(n.hours,Math.round(u))||u<42&&l(n.day,1)||a<30&&l(n.days,Math.round(a))||a<45&&l(n.month,1)||a<365&&l(n.months,Math.round(a/30))||f<1.5&&l(n.year,1)||l(n.years,Math.round(f));var h=n.wordSeparator===undefined?" ":n.wordSeparator;return e.trim([r,c,i].join(h))},parse:function(t){var n=e.trim(t);n=n.replace(/\.\d+/,"");n=n.replace(/-/,"/").replace(/-/,"/");n=n.replace(/T/," ").replace(/Z/," UTC");n=n.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2");return new Date(n)},datetime:function(n){var r=t.isTime(n)?e(n).attr("datetime"):e(n).attr("title");return t.parse(r)},isTime:function(t){return e(t).get(0).tagName.toLowerCase()==="time"}});e.fn.timeago=function(){var e=this;e.each(n);var r=t.settings;if(r.refreshMillis>0){setInterval(function(){e.each(n)},r.refreshMillis)}return e};document.createElement("abbr");document.createElement("time")})(jQuery)
 
+/* ========================================================================
+ * Bootstrap: dropdown.js v3.3.4
+ * http://getbootstrap.com/javascript/#dropdowns
+ * ========================================================================
+ * Copyright 2011-2015 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ * ======================================================================== */
++function(a){"use strict";function e(d){d&&3===d.which||(a(b).remove(),a(c).each(function(){var b=a(this),c=f(b),e={relatedTarget:this};c.hasClass("open")&&(d&&"click"==d.type&&/input|textarea/i.test(d.target.tagName)&&a.contains(c[0],d.target)||(c.trigger(d=a.Event("hide.bs.dropdown",e)),d.isDefaultPrevented()||(b.attr("aria-expanded","false"),c.removeClass("open").trigger("hidden.bs.dropdown",e))))}))}function f(b){var c=b.attr("data-target");c||(c=b.attr("href"),c=c&&/#[A-Za-z]/.test(c)&&c.replace(/.*(?=#[^\s]*$)/,""));var d=c&&a(c);return d&&d.length?d:b.parent()}function g(b){return this.each(function(){var c=a(this),e=c.data("bs.dropdown");e||c.data("bs.dropdown",e=new d(this)),"string"==typeof b&&e[b].call(c)})}var b=".dropdown-backdrop",c='[data-toggle="dropdown"]',d=function(b){a(b).on("click.bs.dropdown",this.toggle)};d.VERSION="3.3.4",d.prototype.toggle=function(b){var c=a(this);if(!c.is(".disabled, :disabled")){var d=f(c),g=d.hasClass("open");if(e(),!g){"ontouchstart"in document.documentElement&&!d.closest(".navbar-nav").length&&a(document.createElement("div")).addClass("dropdown-backdrop").insertAfter(a(this)).on("click",e);var h={relatedTarget:this};if(d.trigger(b=a.Event("show.bs.dropdown",h)),b.isDefaultPrevented())return;c.trigger("focus").attr("aria-expanded","true"),d.toggleClass("open").trigger("shown.bs.dropdown",h)}return!1}},d.prototype.keydown=function(b){if(/(38|40|27|32)/.test(b.which)&&!/input|textarea/i.test(b.target.tagName)){var d=a(this);if(b.preventDefault(),b.stopPropagation(),!d.is(".disabled, :disabled")){var e=f(d),g=e.hasClass("open");if(!g&&27!=b.which||g&&27==b.which)return 27==b.which&&e.find(c).trigger("focus"),d.trigger("click");var h=" li:not(.disabled):visible a",i=e.find('[role="menu"]'+h+', [role="listbox"]'+h);if(i.length){var j=i.index(b.target);38==b.which&&j>0&&j--,40==b.which&&j<i.length-1&&j++,~j||(j=0),i.eq(j).trigger("focus")}}}};var h=a.fn.dropdown;a.fn.dropdown=g,a.fn.dropdown.Constructor=d,a.fn.dropdown.noConflict=function(){return a.fn.dropdown=h,this},a(document).on("click.bs.dropdown.data-api",e).on("click.bs.dropdown.data-api",".dropdown form",function(a){a.stopPropagation()}).on("click.bs.dropdown.data-api",c,d.prototype.toggle).on("keydown.bs.dropdown.data-api",c,d.prototype.keydown).on("keydown.bs.dropdown.data-api",'[role="menu"]',d.prototype.keydown).on("keydown.bs.dropdown.data-api",'[role="listbox"]',d.prototype.keydown)}(jQuery);
+
 Sidekiq = {};
 
 $(function() {
@@ -42,3 +51,31 @@ $(function() {
     $($(this).attr('data-target')).toggle();
   });
 });
+
+function updatePage(url) {
+  setInterval(function () {
+    $.ajax({
+      url: url,
+      dataType: 'html'
+    }).done(function (data) {
+      var $page = $(data).filter('#page')
+      $('#page').replaceWith($page)
+    })
+  }, parseInt(localStorage.timeInterval) || 2000);
+}
+
+$(function() {
+  'use strict';
+
+  var $navbar = $('.navbar-default')
+    , staticContentWidth = 0
+
+  $('[data-navbar="static"]').each(function () {
+    staticContentWidth += $(this).width()
+  });
+
+  if ($navbar.width() < staticContentWidth) {
+    $('[data-navbar="custom-tab"]').hide()
+    $('[data-navbar="dropdown"]').show()
+  }
+});

data/web/assets/stylesheets/application.css

@@ -101,11 +101,6 @@ header.row .pagination {
 .poll-wrapper {
     margin: 9px;
 }
-.nav #live-poll {
-  height: 25px;
-  line-height: 25px;
-  width: 195px;
-}
 #live-poll.active {
   background-color: #009300;
 }
@@ -208,6 +203,53 @@ table .table-checkbox label {
   color: #585454;
 }
 
+@media (max-width: 768px) {
+  .navbar .navbar-header .navbar-livereload {
+    border: none;
+    margin: 9px 10px 0;
+    padding: 0;
+  }
+
+  .navbar .navbar-collapse {
+    max-height: 400px;
+  }
+
+  .navbar .navbar-collapse .navbar-livereload {
+    display: none;
+  }
+
+  .navbar.navbar-fixed-top ul {
+    margin-right: -15px!important;
+  }
+
+  .navbar .nav a {
+    text-align: center;
+  }
+}
+
+@media (width: 768px) {
+  .navbar .navbar-collapse .navbar-livereload {
+    display: block;
+    margin-top: 5px;
+  }
+
+  .navbar .poll-wrapper {
+    margin: 4px 4px 0 0;
+  }
+
+  .navbar .dropdown-menu {
+    min-width: 120px;
+  }
+
+  .navbar .dropdown-menu a {
+    text-align: left;
+  }
+}
+
+.nav .dropdown {
+  display: none;
+}
+
 .navbar-footer .navbar ul.nav {
   text-align: center;
   float: none;
@@ -581,6 +623,10 @@ div.interval-slider input {
   }
 }
 
+.chart {
+  margin: 0;
+}
+
 .history-heading {
   padding-right: 15px;
 }
@@ -600,24 +646,17 @@ div.interval-slider input {
   text-decoration: none;
 }
 
-@media (max-width: 768px) {
+@media (max-width: 767px) {
   .navbar .navbar-brand {
     float: none;
     display: block;
   }
 
-  .navbar ul.nav li a {
-    padding-left: 8px;
-    padding-right: 8px;
-  }
-
   .navbar.navbar-fixed-top ul {
-    float: none;
     margin-right: 0;
   }
 
   .navbar.navbar-fixed-top li {
-    float: none;
     margin-right: 0;
   }
 
@@ -644,14 +683,20 @@ div.interval-slider input {
   .navbar-text {
     float:none;
     line-height: 30px;
+    margin: 15px auto;
   }
 }
 
-@media (max-width: 979px) {
+@media (max-width: 767px) {
   .navbar-fixed-top, .navbar-fixed-bottom {
     margin: 0 -20px;
   }
 
+  .navbar ul.nav li a {
+    padding-left: 8px;
+    padding-right: 8px;
+  }
+
   .admin #page {
     padding-top: 10px;
   }
@@ -686,7 +731,7 @@ div.interval-slider input {
 .container {
   padding: 0;
 }
-@media (max-width: 979px) {
+@media (max-width: 767px) {
   .navbar-fixed-top, .navbar-fixed-bottom {
     position: relative;
     top: auto;

data/web/locales/en.yml

@@ -73,3 +73,4 @@ en: # <---- change this to your locale code
   StopAll: Stop All
   QuietAll: Quiet All
   PollingInterval: Polling interval
+  Plugins: Plugins

data/web/locales/hi.yml

@@ -0,0 +1,75 @@
+# elements like %{queue} are variables and should not be translated
+hi:
+  Dashboard: डैशबोर्ड
+  Status: स्थिती
+  Time: समय
+  Namespace: नामस्थान
+  Realtime: रिअल टाईम
+  History: वृत्तान्त
+  Busy: व्यस्थ
+  Processed: कार्रवाई कृत
+  Failed: असफल
+  Scheduled: परिगणित
+  Retries: पुनर्प्रयास
+  Enqueued: कतारबद्ध
+  Worker: वर्कर
+  LivePoll: लाईव सर्वेक्षण
+  StopPolling: सर्वेक्षण रोको
+  Queue: कतार
+  Class: क्लास
+  Job: कार्य
+  Arguments: अर्गुमेन्ट्स्
+  Extras: अतिरिक्त
+  Started: शुरु हुआ
+  ShowAll: सब दिखाएं
+  CurrentMessagesInQueue: <span class='title'>%{queue}</span> कतार मे वर्तमान कार्य
+  Delete: हटाओ
+  AddToQueue: कतार मे जोड़ें
+  AreYouSureDeleteJob: क्या आप इस कार्य को हटाना चाहते है?
+  AreYouSureDeleteQueue: क्या आप %{queue} कतार को हटाना चाहते है?
+  Queues: कतारे
+  Size: आकार
+  Actions: कार्रवाई
+  NextRetry: अगला पुन:प्रयास
+  RetryCount: पुन:प्रयास संख्या
+  RetryNow: पुन:प्रयास करे
+  Kill: नष्ट करे
+  LastRetry: अंतिम पुन:प्रयास
+  OriginallyFailed: पहिले से विफल
+  AreYouSure: क्या आपको यकीन है?
+  DeleteAll: सब हटाओ
+  RetryAll: सब पुन:प्रयास करे
+  NoRetriesFound: कोई पुनर्प्रयास नही पाए गए
+  Error: एरर
+  ErrorClass: एरर क्लास
+  ErrorMessage: एरर संदेश
+  ErrorBacktrace: एरर बैकट्रेस
+  GoBack: ← पीछे
+  NoScheduledFound: कोई परिगणित कार्य नही पाए गए
+  When: कब
+  ScheduledJobs: परिगणित कार्य
+  idle: निष्क्रिय
+  active: सक्रिय
+  Version: वर्जन
+  Connections: कनेक्श्न
+  MemoryUsage: मेमरी उपयोग
+  PeakMemoryUsage: अधिकतम मेमरी उपयोग
+  Uptime: उपरिकाल (दिवस)
+  OneWeek: १ सप्ताह
+  OneMonth: १ महीना
+  ThreeMonths: ३ महीने
+  SixMonths: ६ महीने
+  Failures: असफलता
+  DeadJobs: निष्प्राण कार्य
+  NoDeadJobsFound: कोई निष्प्राण कार्य नही पाए गए
+  Dead: निष्प्राण
+  Processes: प्रोसेसेस्
+  Thread: थ्रेड
+  Threads: थ्रेड्स्
+  Jobs: कार्य
+  Paused: थमे हुए
+  Stop: रोको
+  Quiet: शांत करो
+  StopAll: सब रोको
+  QuietAll: सब शांत करो
+  PollingInterval: सर्वेक्षण अंतराल

data/web/locales/ru.yml

@@ -2,7 +2,7 @@ ru:
   Dashboard: Панель управления
   Status: Статус
   Time: Время
-  Namespace: Пространоство имен
+  Namespace: Пространство имен
   Realtime: Сейчас
   History: История
   Busy: Занят
@@ -72,3 +72,4 @@ ru:
   StopAll: Остановить все
   QuietAll: Отдыхать всем
   PollingInterval: Интервал опроса
+  Plugins: Плагины

data/web/locales/ta.yml

@@ -0,0 +1,75 @@
+# elements like %{queue} are variables and should not be translated
+ta: # <---- change this to your locale code
+  Dashboard: டாஷ்போர்டு
+  Status: நிலைமை
+  Time: நேரம்
+  Namespace: பெயர்வெளி
+  Realtime: நேரலை
+  History: வரலாறு
+  Busy: பணிமிகுதி
+  Processed: நிறையுற்றது
+  Failed: தோல்வி
+  Scheduled: திட்டமிடப்பட்ட
+  Retries: மீண்டும் முயற்சிக்க,
+  Enqueued: வரிசைப்படுத்தப்பட்டவை
+  Worker: பணியாளர்
+  LivePoll: நேரடி கணிப்பு
+  StopPolling: நிறுத்து வாக்குப்பதிவு
+  Queue: வரிசை
+  Class: வகுப்பு
+  Job: வேலை
+  Arguments: வாதங்கள்,
+  Extras: உபரி
+  Started: தொடங்குதல்
+  ShowAll: அனைத்து காட்டு
+  CurrentMessagesInQueue: தற்போதைய வேலைகள் <span class='title'>%{queue}</span>
+  Delete: நீக்கு
+  AddToQueue: வரிசையில் சேர்
+  AreYouSureDeleteJob: நீ இந்த வேலையை நீக்க வேண்டும் என்று உறுதியாக இருக்கிறீர்களா?
+  AreYouSureDeleteQueue: நீங்கள் %{queue} வரிசையில் நீக்க வேண்டும் என்பதில் உறுதியாக இருக்கிறீர்களா?
+  Queues: வரிசை
+  Size: அளவு
+  Actions: செயல்கள்
+  NextRetry: அடுத்த, மீண்டும் முயற்சிக்கவும்
+  RetryCount: கணிப்பீடு, மீண்டும் முயற்சிக்கவும்
+  RetryNow: இப்போது மீண்டும் முயற்சி செய்க
+  Kill: கொல்
+  LastRetry: கடைசியாக, மீண்டும் முயற்சிக்கவும்
+  OriginallyFailed: முதலில் தோல்வி
+  AreYouSure: நீங்கள் உறுதியாக இருக்கிறீர்களா?
+  DeleteAll: அனைத்து நீக்கு
+  RetryAll: அனைத்து, மீண்டும் முயற்சிக்கவும்
+  NoRetriesFound: இல்லை மீண்டும் காணப்படவில்லை
+  Error: பிழை
+  ErrorClass: பிழை வகுப்பு
+  ErrorMessage: பிழை செய்தி
+  ErrorBacktrace: பிழை பின்தேடுலை
+  GoBack: பின்புறம்
+  NoScheduledFound: திட்டமிட்ட வேலைகள் காணப்படவில்லை
+  When: எப்பொழுது?
+  ScheduledJobs: திட்டமிட்ட வேலைகள்
+  idle: முடங்கு நேரம்
+  active: செயலில்
+  Version: பதிப்பு
+  Connections: இணைப்புகள்
+  MemoryUsage: நினைவக பயன்பாடு
+  PeakMemoryUsage: உச்ச நினைவக பயன்பாடு
+  Uptime: இயக்க நேரம் (நாட்கள்)
+  OneWeek: 1 வாரம்
+  OneMonth: 1 மாதம்
+  ThreeMonths: 3 மாதங்கள்
+  SixMonths: 6 மாதங்கள்
+  Failures: தோல்விகள்
+  DeadJobs: டெட் வேலைகள்
+  NoDeadJobsFound: இறந்த வேலை எதுவும் இல்லை
+  Dead: இறந்துபோன
+  Processes: செயல்முறைகள்
+  Thread: நூல்
+  Threads: நூல்கள்
+  Jobs: வேலை வாய்ப்புகள்
+  Paused: தற்காலிக பணிநிறுத்தம்
+  Stop: நிறுத்து
+  Quiet: அமைதியான
+  StopAll: நிறுத்து அனைத்து
+  QuietAll: அமைதியான அனைத்து
+  PollingInterval: வாக்குப்பதிவு இடைவெளி

data/web/views/_nav.erb

@@ -1,34 +1,67 @@
 <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 %>
+  <div class="container-fluid">
+    <div class="navbar-header" data-navbar="static">
+      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-menu">
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+        <span class="icon-bar"></span>
+      </button>
+      <div class="navbar-toggle collapsed navbar-livereload">
+        <%= erb :_poll %>
+        <% if Sidekiq::Web.app_url %>
+          <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
+        <% end %>
+      </div>
+      <a class="navbar-brand" href="<%= root_path %>">
+        <%= Sidekiq::NAME %>
+        <%= erb :_status %>
+      </a>
+    </div>
+
+    <div class="collapse navbar-collapse" id="navbar-menu">
+      <ul class="nav navbar-nav" data-navbar="static">
+        <% 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 %>
-          <% Sidekiq::Web.custom_tabs.each do |title, url| %>
-              <li class="<%= current_path.start_with?(url) ? 'active' : '' %>">
+        <% end %>
+
+        <li class="dropdown" data-navbar="dropdown">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
+            <%= t('Plugins') %> <span class="caret"></span>
+          </a>
+          <ul class="dropdown-menu" role="menu">
+            <% Sidekiq::Web.custom_tabs.each do |title, url| %>
+              <li>
                 <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
               </li>
-          <% end %>
-        </ul>
-    </div>
-    <div class="poll-wrapper pull-right">
-        <%= erb :_poll %>
-        <% if Sidekiq::Web.app_url %>
-            <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
+            <% end %>
+          </ul>
+        </li>
+
+        <% Sidekiq::Web.custom_tabs.each do |title, url| %>
+          <li class="<%= current_path.start_with?(url) ? 'active' : '' %>" data-navbar="custom-tab">
+            <a href="<%= root_path %><%= url %>"><%= t(title) %></a>
+          </li>
         <% end %>
+      </ul>
+      <ul class="nav navbar-nav navbar-right navbar-livereload" data-navbar="static">
+        <li>
+          <div class="poll-wrapper pull-right">
+            <%= erb :_poll %>
+            <% if Sidekiq::Web.app_url %>
+              <a class="btn btn-inverse" href="<%= Sidekiq::Web.app_url %>">Back to App</a>
+            <% end %>
+          </div>
+        </li>
+      </ul>
     </div>
   </div>
 </div>
+</div>

data/web/views/_poll.erb

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

data/web/views/dashboard.erb

@@ -15,12 +15,12 @@
   </div>
 </div>
 
-<div class="row">
+<div class="row chart">
   <div id="realtime" data-processed-label="<%= t('Processed') %>" data-failed-label="<%= t('Failed') %>"></div>
   <div id="realtime-legend"></div>
 </div>
 
-<div class="row">
+<div class="row chart">
   <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>

data/web/views/layout.erb

@@ -8,6 +8,7 @@
     <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" content="notranslate" />
+    <%= display_custom_head %>
   </head>
   <body class="admin">
     <%= erb :_nav %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.3.4
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-19 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -234,6 +234,7 @@ files:
 - test/test_testing_fake.rb
 - test/test_testing_inline.rb
 - test/test_web.rb
+- test/test_web_helpers.rb
 - test/test_worker_generator.rb
 - web/assets/images/bootstrap/glyphicons-halflings-white.png
 - web/assets/images/bootstrap/glyphicons-halflings.png
@@ -297,6 +298,7 @@ files:
 - web/locales/en.yml
 - web/locales/es.yml
 - web/locales/fr.yml
+- web/locales/hi.yml
 - web/locales/it.yml
 - web/locales/ja.yml
 - web/locales/ko.yml
@@ -307,6 +309,7 @@ files:
 - web/locales/pt.yml
 - web/locales/ru.yml
 - web/locales/sv.yml
+- web/locales/ta.yml
 - web/locales/zh-cn.yml
 - web/locales/zh-tw.yml
 - web/views/_footer.erb
@@ -376,4 +379,5 @@ test_files:
 - test/test_testing_fake.rb
 - test/test_testing_inline.rb
 - test/test_web.rb
+- test/test_web_helpers.rb
 - test/test_worker_generator.rb