Merge branch 'master' into dashboard

Conflicts:
	web/assets/stylesheets/application.css
	web/views/layout.slim

Changes.md

@@ -1,4 +1,9 @@
-- Enable polling for every tab in Web UI
+2.6.0
+-----------
+
+- Enable live polling for every section in Web UI
+- Add Stats API
+- Add Stats::History API
 
 2.5.4
 -----------

lib/sidekiq/api.rb

@@ -54,16 +54,14 @@ module Sidekiq
 
         Sidekiq.redis do |conn|
           processed_keys = conn.keys("stat:processed:*")
-
+          earliest = "stat:processed:#{delete_before_date.to_s}"
-          processed_keys.each do |key|
+          pkeys = processed_keys.select { |key| key < earliest }
-            conn.del(key) if key < "stat:processed:#{delete_before_date.to_s}"
+          conn.del(pkeys) if pkeys.size > 0
-          end
 
           failed_keys = conn.keys("stat:failed:*")
-
+          earliest = "stat:failed:#{delete_before_date.to_s}"
-          failed_keys.each do |key|
+          fkeys = failed_keys.select { |key| key < earliest }
-            conn.del(key) if key < "stat:failed:#{delete_before_date.to_s}"
+          conn.del(fkeys) if fkeys.size > 0
-          end
         end
       end
 

lib/sidekiq/cli.rb

@@ -75,6 +75,8 @@ module Sidekiq
       logger.info "Running in #{RUBY_DESCRIPTION}"
       logger.info Sidekiq::LICENSE
 
+      Sidekiq::Stats::History.cleanup
+
       @manager = Sidekiq::Manager.new(options)
       poller = Sidekiq::Scheduled::Poller.new
       begin

web/views/_nav.slim

@@ -1,17 +1,12 @@
 .navbar-inner
   .container
-    a.btn.btn-navbar data-toggle="collapse" data-target=".nav-collapse"
-      span.icon-bar
-      span.icon-bar
-      span.icon-bar
     a.brand href='#{{root_path}}'
       = Sidekiq::NAME
-    div.nav-collapse
+    ul.nav
-      ul.nav
+      - tabs.each do |title, url|
-        - tabs.each do |title, url|
+        - if url == ''
-          - if url == ''
+          li class="#{(current_path == url) ? 'active':''}"
-            li class="#{(current_path == url) ? 'active':''}"
+            a href='#{{root_path}}#{{url}}' #{title}
-              a href='#{{root_path}}#{{url}}' #{title}
+        - else
-          - else
+          li class="#{(current_path =~ Regexp.new(url)) ? 'active':''}"
-            li class="#{(current_path =~ Regexp.new(url)) ? 'active':''}"
+            a href='#{{root_path}}#{{url}}' #{title}
-              a href='#{{root_path}}#{{url}}' #{title}

web/views/layout.slim

@@ -2,6 +2,7 @@ doctype html
 html
   head
     title= Sidekiq::NAME
+    meta name="viewport" content="width=device-width,initial-scale=1.0"
     link href='#{{root_path}}stylesheets/bootstrap.css' media='screen' rel='stylesheet' type='text/css'
     link href='#{{root_path}}stylesheets/application.css' media='screen' rel='stylesheet' type='text/css'
     script type="text/javascript" src="#{{root_path}}javascripts/application.js"
@@ -16,14 +17,13 @@ html
     .navbar.navbar-fixed-bottom.navbar-inverse
       .navbar-inner
         .container
-          .nav-collapse
+          ul.nav
-            ul.nav
+            li
-              li
+              p.navbar-text style="color:white;" Sidekiq v#{Sidekiq::VERSION}
-                p.navbar-text style="color:white;" Sidekiq v#{Sidekiq::VERSION}
+            li
-              li
+              p.navbar-text Redis: #{location}
-                p.navbar-text Redis: #{location}
+            li
-              li
+              p.navbar-text Time: #{Time.now.utc.strftime('%H:%M:%S UTC')}
-                p.navbar-text Time: #{Time.now.utc.strftime('%H:%M:%S UTC')}
 
     #page
       .container
@@ -41,4 +41,4 @@ html
                   a#live-poll.btn.btn-block.btn-primary href='#{{root_path}}#{{current_path}}?poll=true' Live Poll
 
           .span10
-            == yield
+            == yield