sidekiq 2.4.0 → 2.5.0

data/web/assets/stylesheets/partials/_prettify.css

@@ -0,0 +1,30 @@
+.com { color: #93a1a1; }
+.lit { color: #195f91; }
+.pun, .opn, .clo { color: #93a1a1; }
+.fun { color: #dc322f; }
+.str, .atv { color: #D14; }
+.kwd, .linenums .tag { color: #1e347b; }
+.typ, .atn, .dec, .var { color: teal; }
+.pln { color: #48484c; }
+
+.prettyprint {
+  padding: 8px;
+  background-color: #f7f7f9;
+  border: 1px solid #e9e9e9;
+}
+.prettyprint.linenums {
+  -webkit-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+     -moz-box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+          box-shadow: inset 40px 0 0 #fbfbfc, inset 41px 0 0 #ececf0;
+}
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums {
+  margin: 0 0 0 33px; /* IE indents via margin-left */
+} 
+ol.linenums li {
+  padding-left: 12px;
+  color: #bebec5;
+  line-height: 18px;
+  text-shadow: 0 1px 0 #fff;
+}

data/web/assets/stylesheets/partials/_variables.scss

@@ -0,0 +1,28 @@
+/* susy config */
+/* see http://susy.oddbird.net/guides/reference/ */
+$total-columns:     12;
+$column-width:      4.5em;
+$gutter-width:      1em;
+$grid-padding:      $gutter-width;
+$border-box-sizing: true;
+$base-font-size:    13px;
+$base-line-height:  20px;
+$breakpoint:        0em 45em; /* min-max media query breakpoint */
+$from-direction:    left;
+$omega-float:       $from-direction;
+
+
+/* column shortcuts */
+$one-third:   $total-columns / 3;
+$two-thirds:  $one-third * 2;
+$half:        $total-columns / 2;
+$one-fourth:  $total-columns / 4;
+
+/* colors */
+$black:     #292724;
+$bg-color:  #f3f3f3;
+
+/* others */
+$font-size:         $base-font-size;
+$line-height:       $base-line-height;
+$container-padding: $base-line-height;

data/web/assets/stylesheets/public.scss

@@ -0,0 +1,74 @@
+.public{
+  .title{
+    position:relative;
+    &.reset{
+      .image{
+        position:relative;
+        text-indent:-1400px;
+      }
+      .text{
+        @include transform(rotate(0deg));
+      }
+    }
+    .image{
+      display:inline-block;
+      text-indent:0;
+      img{
+        max-width:none;
+      }
+
+      @include transition(all $kick_time ease-out);
+    }
+    .text{
+      display:inline-block;
+      @include transition(all $kick_time ease-out $kick_time*0.90);
+
+      @include transform(rotate(2deg));
+    }
+  }
+  &.csstransforms3d{
+    .title{
+      margin:0 auto;
+      width: 450px;
+      @media (max-width: $split_width) {
+        width: 280px;
+        .logo{
+          width: 60px;
+        }
+      }
+
+      &.reset{
+        .image{
+          text-indent:0;
+          @include transform3d(translateX(-1000px));
+        }
+        .text{
+          @include transform3d(translateX(0px) rotate(0deg));
+        }
+      }
+      .image{
+        position:absolute;
+        top: 0;
+        left:0;
+        @include transform3d(translateX(0px));
+        img{
+          position:absolute;
+          top: 0;
+          left:0;
+        }
+      }
+      .text{
+        @include transform3d(translateX(35px) rotateZ(2deg));
+      }
+    }
+  }
+  .navbar-inner{
+    @include border-radius(0);
+    border-left:0;
+    border-right:0;
+    @media (max-width: $split_width) {
+      padding:0;
+    }
+  }
+}
+

data/web/assets/stylesheets/style.scss

@@ -0,0 +1,69 @@
+$split_width: 500px;
+
+@import 'compass';
+
+@import 'partials/fonts';
+@import 'partials/colors';
+@import 'partials/variables';
+@import 'partials/base';
+@import 'partials/layout';
+@import 'partials/prettify';
+
+@import 'partials/navbar';
+
+$kick_time : 0.2s;
+
+$status_spacing: 50px;
+@import 'status/*.png';
+@include all-status-sprites;
+
+
+.btn{
+  font-weight: 700;
+  border     : none;
+  @include border-radius(3px);
+  @include box-shadow($smooth_shadow);
+  @include background-image($btn_gradient);
+  &:hover{
+    background-color:$btn_dark;
+  }
+}
+
+.btn-primary{
+  @include background-image($btn_primary_gradient);
+  &:hover{
+    background-color:$btn_primary_dark;
+  }
+}
+
+.btn-danger{
+  @include background-image($btn_danger_gradient);
+  &:hover{
+    background-color:$btn_danger_dark;
+  }
+}
+
+.poll-status{
+  padding:10px 0;
+}
+
+// .status_idle{
+//   @include background-image('images/status/idle.png');
+// }
+
+@mixin status_size($icon){
+  $height: status-sprite-height($icon);
+  $width : status-sprite-width($icon);
+  height : $height;
+  width  : $width;
+  display: inline-block;
+}
+
+.status-idle{
+  @include status_size('idle');
+}
+.status-active{
+  @include status_size('active');
+}
+
+@import 'public';

data/web/assets/stylesheets/vendors.scss

@@ -0,0 +1,2 @@
+//= require vendor/bootstrap
+//= require vendor/bootstrap-responsive

data/web/views/_nav.slim

@@ -0,0 +1,13 @@
+.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
+        - tabs.each do |title, url|
+          li class="#{(current_path==url) ? 'active':''}"
+            a href='#{{root_path}}#{{url}}' #{title}

data/web/views/_status.slim

@@ -0,0 +1,3 @@
+span.status
+  i class="status-sprite status-#{current_status}"
+  == current_status

data/web/views/_summary.slim

@@ -1,8 +1,19 @@
-.hero-unit
-  h1 Sidekiq is #{current_status}
-  p Processed: #{number_with_delimiter(processed)}
-  p Failed: #{number_with_delimiter(failed)}
-  p Busy Workers: #{number_with_delimiter(workers.size)}
-  p Scheduled: #{number_with_delimiter(zcard('schedule'))}
-  p Retries Pending: #{number_with_delimiter(zcard('retry'))}
-  p Queue Backlog: #{number_with_delimiter(backlog)}
+ul.unstyled.summary
+  li
+    span.count #{number_with_delimiter(processed)}
+    span.desc  Processed
+  li
+    span.count #{number_with_delimiter(failed)}
+    span.desc  Failed
+  li
+    span.count #{number_with_delimiter(workers.size)}
+    span.desc  Busy
+  li
+    span.count #{number_with_delimiter(zcard('schedule'))}
+    span.desc  Scheduled
+  li
+    span.count #{number_with_delimiter(zcard('retry'))}
+    span.desc  Retries
+  li
+    span.count #{number_with_delimiter(backlog)}
+    span.desc  Queue

data/web/views/_workers.slim

@@ -1,14 +1,21 @@
-table class="table table-striped table-bordered workers"
-  tr
+table class="workers table table-hover table-bordered table-striped table-white"
+  thead
     th Worker
     th Queue
     th Class
     th Arguments
     th Started
-  - workers.each do |(worker, msg)|
+  - workers.each_with_index do |(worker, msg), index|
     tr
       td= worker
-      td= msg['queue']
+      td
+        a href="queues/#{msg['queue']}" = msg['queue']
       td= msg['payload']['class']
-      td= msg['payload']['args'].inspect[0..100]
+      td
+        - 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']
+        - 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/index.slim

@@ -1,11 +1,10 @@
-== slim :_summary
-
-.actions
-  form.pull-left action="#{root_path}reset" method="post"
-    button.btn.btn-small type="submit" title="If you kill -9 Sidekiq, this table can fill up with old data." Clear worker list
-  .pull-right
-    span.poll-status
-    a.btn.btn-small name='poll' href='#{{root_path}}poll' Live Poll
+.row.header
+  .span7
+    h3 Workers
 
 == slim :_workers
-
+- if workers.size > 0
+  .row
+    .span2.pull-right
+      form action="#{root_path}reset" method="post"
+        button.btn.btn-primary.btn-block type="submit" title="If you kill -9 Sidekiq, this table can fill up with old data." Clear Worker List

data/web/views/layout.slim

@@ -1,33 +1,41 @@
 doctype html
 html
   head
+    link href='#{{root_path}}assets/vendors.css' media='screen' rel='stylesheet' type='text/css'
     link href='#{{root_path}}assets/application.css' media='screen' rel='stylesheet' type='text/css'
     title= Sidekiq::NAME
-  body
-    .navbar.navbar-fixed-top.navbar-inverse
+  body.admin
+    .navbar.navbar-fixed-top
+      ==slim :_nav
+    .navbar.navbar-fixed-bottom.navbar-inverse
       .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
+          .nav-collapse
             ul.nav
               li
-                a href='#{{root_path}}' Home
-              - tabs.each do |tab|
-                li
-                  a href='#{{root_path}}#{{tab.downcase}}': #{tab}
-
-            ul.nav.pull-right
+                p.navbar-text style="color:white;" Sidekiq v#{Sidekiq::VERSION}
               li
-                a Redis: #{location}
+                p.navbar-text Redis: #{location}
               li
-                a #{Time.now.utc}
+                p.navbar-text Time: #{Time.now.utc.strftime('%H:%M:%S UTC')}
+
+
+    #page
+      .container
+        .row
+          .span2.summary_bar
+            h4
+              span.title Status
+              == slim :_status
+            == slim :_summary
+            .row
+              .span2
+                a#live-poll.btn.btn-block.btn-primary name='poll' href='#{{root_path}}poll' Live Poll
+              .span2.poll-status
+                span.text
+                span.time
 
-    .container
-      == yield
+          .span10
+            == yield
 
     script type="text/javascript" src="#{{root_path}}assets/application.js"

data/web/views/poll.slim

@@ -1,3 +1,4 @@
 div
   == slim :_summary
   == slim :_workers
+  == slim :_status

data/web/views/queue.slim

@@ -1,15 +1,28 @@
-header
-  h1 Current messages in #{@name}
+header.row
+  .span5
+    h3
+      | Current messages in 
+      span.title #{@name}
+  .span4
+    == slim :_paging, :locals => { :url => "#{root_path}queues/#{@name}" }
 
-== slim :_paging, :locals => { :url => "#{root_path}queues/#{@name}" }
-
-table class="table table-striped table-bordered"
-  tr
+table class="queue table table-hover table-bordered table-striped"
+  thead
     th Class
     th Arguments
-  - @messages.each do |msg|
+    th
+  - @messages.each_with_index do |msg, index|
     tr
       td= msg['class']
-      td= msg['args'].inspect[0..100]
-
+      td
+        - 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']
+        - else
+          = msg['args']
+      td 
+        form action="#{root_path}queues/#{@name}/delete" method="post" 
+          input name="key_val" value="#{msg.to_json}" type="hidden"
+          input.btn.btn-danger.btn-mini type="submit" name="delete" value="Delete" data-confirm="Are you sure you want to delete this job?"
 == slim :_paging, :locals => { :url => "#{root_path}queues/#{@name}" }

data/web/views/queues.slim

@@ -1,19 +1,19 @@
-h1 Queues
+h3 Queues
 
 - if @queues.size > 0
-  table class="table table-striped table-bordered"
-    tr
+  table class="queues table table-hover table-bordered table-striped table-white"
+    thead
       th Queue
       th Size
-      th
+      th Actions
     - queues.each do |(queue, size)|
       tr
         td
           a href="#{root_path}queues/#{queue}" #{queue}
         td= number_with_delimiter(size)
-        td
+        td width="20%"
           form action="#{root_path}queues/#{queue}" method="post"
-            input.btn.btn-danger type="submit" name="delete" value="Delete" data-confirm="Are you sure you want to delete the #{queue} queue?"
+            input.btn.btn-danger.btn-small type="submit" name="delete" value="Delete" data-confirm="Are you sure you want to delete the #{queue} queue?"
 - else
   p No queues found.
-  a href="#{root_path}" Back
+  a href="#{root_path}" ← Back

data/web/views/retries.slim

@@ -1,15 +1,19 @@
-h1 Retries
+header.row
+  .span5
+    h3 Retries
+  .span4
+    - if @retries.size > 0
+      == slim :_paging, :locals => { :url => "#{root_path}retries" }
 
 - if @retries.size > 0
-  == slim :_paging, :locals => { :url => "#{root_path}retries" }
 
   form action="#{root_path}retries" method="post"
-    table class="table table-striped table-bordered"
+    table class="table table-striped table-bordered table-white"
       tr
-        th
+        th width="20px"
           input type="checkbox" class="check_all"
-        th Next Retry
-        th Retry Count
+        th width="25%" Next Retry
+        th width="11%" Retry count
         th Queue
         th Worker
         th Args
@@ -24,8 +28,7 @@ h1 Retries
             a href="#{root_path}queues/#{msg['queue']}" #{msg['queue']}
           td= msg['class']
           td= display_args(msg['args'])
-    input.btn.btn-primary type="submit" name="retry" value="Retry Now"
-    input.btn.btn-danger type="submit" name="delete" value="Delete"
+    input.btn.btn-danger.btn-small.pull-right type="submit" name="delete" value="Delete"
+    input.btn.btn-primary.btn-small.pull-right type="submit" name="retry" value="Retry Now" 
 - else
-  p No retries found.
-  a href="#{root_path}" Back
+  .alert.alert-success No retries were found