sidekiq 3.0.2 → 3.1.0

data/web/assets/stylesheets/application.css

@@ -369,6 +369,79 @@ img.smallogo {
     margin: 5px 5px 5px 10px;
   }
 }
+
+/* Dashboard
+********************************** */
+div.dashboard h3 {
+  float: left;
+}
+
+div.interval-slider {
+  float: right;
+  line-height: 1.3;
+  font-size: 0.95em;
+  padding: 15px 0 0;
+}
+
+span.current-interval {
+  min-width: 40px;
+  display: inline-block;
+  padding: 0 0 5px 0;
+  color: #B1003E;
+}
+
+div.interval-slider input {
+  width: 160px;
+}
+
+#realtime-legend,
+#history-legend {
+  width: 490px;
+  text-align: left;
+  margin-top: 5px;
+  float: right;
+}
+#realtime-legend .timestamp,
+#history-legend .timestamp {
+  display: inline-block;
+  width: 220px;
+  text-align: right;
+}
+#realtime-legend .line,
+#history-legend .line {
+  display: inline-block;
+  margin: 0 0 0 20px;
+}
+#realtime-legend .swatch,
+#history-legend .swatch {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  margin: 0 8px 0 0;
+}
+#realtime-legend .tag,
+#history-legend .tag {
+  display: inline-block;
+}
+
+@media (max-width: 790px) {
+  #realtime-legend,
+  #history-legend {
+    float: none;
+    width: 100%;
+    margin-bottom: 20px;
+  }
+}
+
+@media (max-width: 500px) {
+  #realtime-legend,
+  #history-legend {
+    text-align: center;
+  }
+}
+/* Beacon
+********************************** */
+
 .beacon {
   position: relative;
   height: 20px;
@@ -608,313 +681,8 @@ img.smallogo {
 }
 
 /* Rickshaw */
-.rickshaw_graph .detail {
-  pointer-events: none;
-  position: absolute;
-  top: 0;
-  z-index: 2;
-  background: rgba(0, 0, 0, 0.1);
-  bottom: 0;
-  width: 1px;
-  transition: opacity 0.25s linear;
-  -moz-transition: opacity 0.25s linear;
-  -o-transition: opacity 0.25s linear;
-  -webkit-transition: opacity 0.25s linear;
-}
-.rickshaw_graph .detail.inactive {
-  opacity: 0;
-}
-.rickshaw_graph .detail .item.active {
-  opacity: 1;
-}
-.rickshaw_graph .detail .x_label {
-  font-family: Arial, sans-serif;
-  border-radius: 3px;
-  padding: 6px;
-  opacity: 0.5;
-  border: 1px solid #e0e0e0;
-  font-size: 12px;
-  position: absolute;
-  background: white;
-  white-space: nowrap;
-}
-.rickshaw_graph .detail .item {
-  position: absolute;
-  z-index: 2;
-  border-radius: 3px;
-  padding: 0.25em;
-  font-size: 12px;
-  font-family: Arial, sans-serif;
-  opacity: 0;
-  background: rgba(0, 0, 0, 0.4);
-  color: white;
-  border: 1px solid rgba(0, 0, 0, 0.4);
-  margin-left: 1em;
-  margin-top: -1em;
-  white-space: nowrap;
-}
-.rickshaw_graph .detail .item.active {
-  opacity: 1;
-  background: rgba(0, 0, 0, 0.8);
-}
-.rickshaw_graph .detail .item:before {
-  content: "\25c2";
-  position: absolute;
-  left: -0.5em;
-  color: rgba(0, 0, 0, 0.7);
-  width: 0;
-}
-.rickshaw_graph .detail .dot {
-  width: 4px;
-  height: 4px;
-  margin-left: -4px;
-  margin-top: -3px;
-  border-radius: 5px;
-  position: absolute;
-  box-shadow: 0 0 2px rgba(0, 0, 0, 0.6);
-  background: white;
-  border-width: 2px;
-  border-style: solid;
-  display: none;
-  background-clip: padding-box;
-}
-.rickshaw_graph .detail .dot.active {
-  display: block;
-}
-/* graph */
-
-.rickshaw_graph {
-  position: relative;
-}
-.rickshaw_graph svg {
-  display: block;
-  overflow: hidden;
-}
+.rickshaw_graph .detail{pointer-events:none;position:absolute;top:0;z-index:2;background:rgba(0,0,0,.1);bottom:0;width:1px;transition:opacity .25s linear;-moz-transition:opacity .25s linear;-o-transition:opacity .25s linear;-webkit-transition:opacity .25s linear}.rickshaw_graph .detail.inactive{opacity:0}.rickshaw_graph .detail .item.active{opacity:1}.rickshaw_graph .detail .x_label{font-family:Arial,sans-serif;border-radius:3px;padding:6px;opacity:.5;border:1px solid #e0e0e0;font-size:12px;position:absolute;background:#fff;white-space:nowrap}.rickshaw_graph .detail .x_label.left{left:0}.rickshaw_graph .detail .x_label.right{right:0}.rickshaw_graph .detail .item{position:absolute;z-index:2;border-radius:3px;padding:.25em;font-size:12px;font-family:Arial,sans-serif;opacity:0;background:rgba(0,0,0,.4);color:#fff;border:1px solid rgba(0,0,0,.4);margin-left:1em;margin-right:1em;margin-top:-1em;white-space:nowrap}.rickshaw_graph .detail .item.left{left:0}.rickshaw_graph .detail .item.right{right:0}.rickshaw_graph .detail .item.active{opacity:1;background:rgba(0,0,0,.8)}.rickshaw_graph .detail .item:after{position:absolute;display:block;width:0;height:0;content:"";border:5px solid transparent}.rickshaw_graph .detail .item.left:after{top:1em;left:-5px;margin-top:-5px;border-right-color:rgba(0,0,0,.8);border-left-width:0}.rickshaw_graph .detail .item.right:after{top:1em;right:-5px;margin-top:-5px;border-left-color:rgba(0,0,0,.8);border-right-width:0}.rickshaw_graph .detail .dot{width:4px;height:4px;margin-left:-3px;margin-top:-3.5px;border-radius:5px;position:absolute;box-shadow:0 0 2px rgba(0,0,0,.6);box-sizing:content-box;-moz-box-sizing:content-box;background:#fff;border-width:2px;border-style:solid;display:none;background-clip:padding-box}.rickshaw_graph .detail .dot.active{display:block}.rickshaw_graph{position:relative}.rickshaw_graph svg{display:block;overflow:hidden}.rickshaw_graph .x_tick{position:absolute;top:0;bottom:0;width:0;border-left:1px dotted rgba(0,0,0,.2);pointer-events:none}.rickshaw_graph .x_tick .title{position:absolute;font-size:12px;font-family:Arial,sans-serif;opacity:.5;white-space:nowrap;margin-left:3px;bottom:1px}.rickshaw_annotation_timeline{height:1px;border-top:1px solid #e0e0e0;margin-top:10px;position:relative}.rickshaw_annotation_timeline .annotation{position:absolute;height:6px;width:6px;margin-left:-2px;top:-3px;border-radius:5px;background-color:rgba(0,0,0,.25)}.rickshaw_graph .annotation_line{position:absolute;top:0;bottom:-6px;width:0;border-left:2px solid rgba(0,0,0,.3);display:none}.rickshaw_graph .annotation_line.active{display:block}.rickshaw_graph .annotation_range{background:rgba(0,0,0,.1);display:none;position:absolute;top:0;bottom:-6px}.rickshaw_graph .annotation_range.active{display:block}.rickshaw_graph .annotation_range.active.offscreen{display:none}.rickshaw_annotation_timeline .annotation .content{background:#fff;color:#000;opacity:.9;padding:5px;box-shadow:0 0 2px rgba(0,0,0,.8);border-radius:3px;position:relative;z-index:20;font-size:12px;padding:6px 8px 8px;top:18px;left:-11px;width:160px;display:none;cursor:pointer}.rickshaw_annotation_timeline .annotation .content:before{content:"\25b2";position:absolute;top:-11px;color:#fff;text-shadow:0 -1px 1px rgba(0,0,0,.8)}.rickshaw_annotation_timeline .annotation.active,.rickshaw_annotation_timeline .annotation:hover{background-color:rgba(0,0,0,.8);cursor:none}.rickshaw_annotation_timeline .annotation .content:hover{z-index:50}.rickshaw_annotation_timeline .annotation.active .content{display:block}.rickshaw_annotation_timeline .annotation:hover .content{display:block;z-index:50}.rickshaw_graph .y_axis,.rickshaw_graph .x_axis_d3{fill:none}.rickshaw_graph .y_ticks .tick line,.rickshaw_graph .x_ticks_d3 .tick{stroke:rgba(0,0,0,.16);stroke-width:2px;shape-rendering:crisp-edges;pointer-events:none}.rickshaw_graph .y_grid .tick,.rickshaw_graph .x_grid_d3 .tick{z-index:-1;stroke:rgba(0,0,0,.2);stroke-width:1px;stroke-dasharray:1 1}.rickshaw_graph .y_grid .tick[data-y-value="0"]{stroke-dasharray:1 0}.rickshaw_graph .y_grid path,.rickshaw_graph .x_grid_d3 path{fill:none;stroke:none}.rickshaw_graph .y_ticks path,.rickshaw_graph .x_ticks_d3 path{fill:none;stroke:gray}.rickshaw_graph .y_ticks text,.rickshaw_graph .x_ticks_d3 text{opacity:.5;font-size:12px;pointer-events:none}.rickshaw_graph .x_tick.glow .title,.rickshaw_graph .y_ticks.glow text{fill:#000;color:#000;text-shadow:-1px 1px 0 rgba(255,255,255,.1),1px -1px 0 rgba(255,255,255,.1),1px 1px 0 rgba(255,255,255,.1),0 1px 0 rgba(255,255,255,.1),0 -1px 0 rgba(255,255,255,.1),1px 0 0 rgba(255,255,255,.1),-1px 0 0 rgba(255,255,255,.1),-1px -1px 0 rgba(255,255,255,.1)}.rickshaw_graph .x_tick.inverse .title,.rickshaw_graph .y_ticks.inverse text{fill:#fff;color:#fff;text-shadow:-1px 1px 0 rgba(0,0,0,.8),1px -1px 0 rgba(0,0,0,.8),1px 1px 0 rgba(0,0,0,.8),0 1px 0 rgba(0,0,0,.8),0 -1px 0 rgba(0,0,0,.8),1px 0 0 rgba(0,0,0,.8),-1px 0 0 rgba(0,0,0,.8),-1px -1px 0 rgba(0,0,0,.8)}.rickshaw_legend{font-family:Arial;font-size:12px;color:#fff;background:#404040;display:inline-block;padding:12px 5px;border-radius:2px;position:relative}.rickshaw_legend:hover{z-index:10}.rickshaw_legend .swatch{width:10px;height:10px;border:1px solid rgba(0,0,0,.2)}.rickshaw_legend .line{clear:both;line-height:140%;padding-right:15px}.rickshaw_legend .line .swatch{display:inline-block;margin-right:3px;border-radius:2px}.rickshaw_legend .label{margin:0;white-space:nowrap;display:inline;font-size:inherit;background-color:transparent;color:inherit;font-weight:400;line-height:normal;padding:0;text-shadow:none}.rickshaw_legend .action:hover{opacity:.6}.rickshaw_legend .action{margin-right:.2em;font-size:10px;opacity:.2;cursor:pointer;font-size:14px}.rickshaw_legend .line.disabled{opacity:.4}.rickshaw_legend ul{list-style-type:none;margin:0;padding:0;margin:2px;cursor:pointer}.rickshaw_legend li{padding:0 0 0 2px;min-width:80px;white-space:nowrap}.rickshaw_legend li:hover{background:rgba(255,255,255,.08);border-radius:3px}.rickshaw_legend li:active{background:rgba(255,255,255,.2);border-radius:3px}
 
-/* ticks */
-
-.rickshaw_graph .x_tick {
-  position: absolute;
-  top: 0;
-  bottom: 0;
-  width: 0px;
-  border-left: 1px dotted rgba(0, 0, 0, 0.2);
-  pointer-events: none;
-}
-.rickshaw_graph .x_tick .title {
-  position: absolute;
-  font-size: 12px;
-  font-family: Arial, sans-serif;
-  opacity: 0.5;
-  white-space: nowrap;
-  margin-left: 3px;
-  bottom: 1px;
-}
-
-/* annotations */
-
-.rickshaw_annotation_timeline {
-  height: 1px;
-  border-top: 1px solid #e0e0e0;
-  margin-top: 10px;
-  position: relative;
-}
-.rickshaw_annotation_timeline .annotation {
-  position: absolute;
-  height: 6px;
-  width: 6px;
-  margin-left: -2px;
-  top: -3px;
-  border-radius: 5px;
-  background-color: rgba(0, 0, 0, 0.25);
-}
-.rickshaw_graph .annotation_line {
-  position: absolute;
-  top: 0;
-  bottom: -6px;
-  width: 0px;
-  border-left: 2px solid rgba(0, 0, 0, 0.3);
-  display: none;
-}
-.rickshaw_graph .annotation_line.active {
-  display: block;
-}
-
-.rickshaw_graph .annotation_range {
-        background: rgba(0, 0, 0, 0.1);
-        display: none;
-        position: absolute;
-        top: 0;
-        bottom: -6px;
-        z-index: -10;
-}
-.rickshaw_graph .annotation_range.active {
-        display: block;
-}
-.rickshaw_graph .annotation_range.active.offscreen {
-        display: none;
-}
-
-.rickshaw_annotation_timeline .annotation .content {
-  background: white;
-  color: black;
-  opacity: 0.9;
-  padding: 5px 5px;
-  box-shadow: 0 0 2px rgba(0, 0, 0, 0.8);
-  border-radius: 3px;
-  position: relative;
-  z-index: 20;
-  font-size: 12px;
-  padding: 6px 8px 8px;
-  top: 18px;
-  left: -11px;
-  width: 160px;
-  display: none;
-  cursor: pointer;
-}
-.rickshaw_annotation_timeline .annotation .content:before {
-  content: "\25b2";
-  position: absolute;
-  top: -11px;
-  color: white;
-  text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.8);
-}
-.rickshaw_annotation_timeline .annotation.active,
-.rickshaw_annotation_timeline .annotation:hover {
-  background-color: rgba(0, 0, 0, 0.8);
-  cursor: none;
-}
-.rickshaw_annotation_timeline .annotation .content:hover {
-  z-index: 50;
-}
-.rickshaw_annotation_timeline .annotation.active .content {
-  display: block;
-}
-.rickshaw_annotation_timeline .annotation:hover .content {
-  display: block;
-  z-index: 50;
-}
-.rickshaw_graph .y_axis {
-  fill: none;
-}
-.rickshaw_graph .y_ticks .tick {
-  stroke: rgba(0, 0, 0, 0.16);
-  stroke-width: 2px;
-  shape-rendering: crisp-edges;
-  pointer-events: none;
-}
-.rickshaw_graph .y_grid .tick {
-  z-index: -1;
-  stroke: rgba(0, 0, 0, 0.20);
-  stroke-width: 1px;
-  stroke-dasharray: 1 1;
-}
-.rickshaw_graph .y_grid path {
-  fill: none;
-  stroke: none;
-}
-.rickshaw_graph .y_ticks path {
-  fill: none;
-  stroke: #808080;
-}
-.rickshaw_graph .y_ticks text {
-  opacity: 0.5;
-  font-size: 12px;
-  pointer-events: none;
-}
-.rickshaw_graph .x_tick.glow .title,
-.rickshaw_graph .y_ticks.glow text {
-  fill: black;
-  color: black;
-  text-shadow:
-    -1px 1px 0 rgba(255, 255, 255, 0.1),
-    1px -1px 0 rgba(255, 255, 255, 0.1),
-    1px 1px 0 rgba(255, 255, 255, 0.1),
-    0px 1px 0 rgba(255, 255, 255, 0.1),
-    0px -1px 0 rgba(255, 255, 255, 0.1),
-    1px 0px 0 rgba(255, 255, 255, 0.1),
-    -1px 0px 0 rgba(255, 255, 255, 0.1),
-    -1px -1px 0 rgba(255, 255, 255, 0.1);
-}
-.rickshaw_graph .x_tick.inverse .title,
-.rickshaw_graph .y_ticks.inverse text {
-  fill: white;
-  color: white;
-  text-shadow:
-    -1px 1px 0 rgba(0, 0, 0, 0.8),
-    1px -1px 0 rgba(0, 0, 0, 0.8),
-    1px 1px 0 rgba(0, 0, 0, 0.8),
-    0px 1px 0 rgba(0, 0, 0, 0.8),
-    0px -1px 0 rgba(0, 0, 0, 0.8),
-    1px 0px 0 rgba(0, 0, 0, 0.8),
-    -1px 0px 0 rgba(0, 0, 0, 0.8),
-    -1px -1px 0 rgba(0, 0, 0, 0.8);
-}
-.rickshaw_legend {
-  font-family: Arial;
-  font-size: 12px;
-  color: white;
-  background: #404040;
-  display: inline-block;
-  padding: 12px 5px;
-  border-radius: 2px;
-  position: relative;
-}
-.rickshaw_legend:hover {
-  z-index: 10;
-}
-.rickshaw_legend .swatch {
-  width: 10px;
-  height: 10px;
-  border: 1px solid rgba(0, 0, 0, 0.2);
-}
-.rickshaw_legend .line {
-  clear: both;
-  line-height: 140%;
-  padding-right: 15px;
-}
-.rickshaw_legend .line .swatch {
-  display: inline-block;
-  margin-right: 3px;
-  border-radius: 2px;
-}
-.rickshaw_legend .label {
-  white-space: nowrap;
-  display: inline;
-}
-.rickshaw_legend .action:hover {
-  opacity: 0.6;
-}
-.rickshaw_legend .action {
-  margin-right: 0.2em;
-  font-size: 10px;
-  opacity: 0.2;
-  cursor: pointer;
-  font-size: 14px;
-}
-.rickshaw_legend .line.disabled {
-  opacity: 0.4;
-}
-.rickshaw_legend ul {
-  list-style-type: none;
-  margin: 0;
-  padding: 0;
-  margin: 2px;
-  cursor: pointer;
-}
-.rickshaw_legend li {
-  padding: 0 0 0 2px;
-  min-width: 80px;
-  white-space: nowrap;
-}
-.rickshaw_legend li:hover {
-  background: rgba(255, 255, 255, 0.08);
-  border-radius: 3px;
-}
-.rickshaw_legend li:active {
-  background: rgba(255, 255, 255, 0.2);
-  border-radius: 3px;
-}
 .code-wrap {
   white-space: normal;
 }
@@ -934,8 +702,8 @@ img.smallogo {
   padding: 0;
 }
 @media (max-width: 979px) {
-    .navbar-fixed-top, .navbar-fixed-bottom {
-      position: relative;
-      top: auto;
-    }
+  .navbar-fixed-top, .navbar-fixed-bottom {
+    position: relative;
+    top: auto;
+  }
 }

data/web/locales/en.yml

@@ -67,3 +67,8 @@ en: # <---- change this to your locale code
   Threads: Threads
   Jobs: Jobs
   Paused: Paused
+  Stop: Stop
+  Quiet: Quiet
+  StopAll: Stop All
+  QuietAll: Quiet All
+  PollingInterval: Polling interval

data/web/views/_job_info.erb

@@ -7,13 +7,13 @@
     <tr>
       <th><%= t('Queue') %></th>
       <td>
-        <a href="<%= root_path %>queues/<%= job['queue'] %>"><%= job['queue'] %></a>
+        <a href="<%= root_path %>queues/<%= job.queue %>"><%= job.queue %></a>
       </td>
     </tr>
     <tr>
-      <th><%= t('Class') %></th>
+      <th><%= t('Job') %></th>
       <td>
-        <code><%= job['class'] %></code>
+        <code><%= job.display_class %></code>
       </td>
     </tr>
     <tr>
@@ -21,7 +21,7 @@
       <td>
         <code class="code-wrap">
           <!-- We don't want to truncate any job arguments when viewing a single job's status page -->
-          <div class="args-extended"><%= display_args(job['args'], nil) %></div>
+          <div class="args-extended"><%= display_args(job.display_args, nil) %></div>
         </code>
       </td>
     </tr>

data/web/views/_poll.erb

@@ -1,6 +1,6 @@
 <% if params[:poll] %>
   <script>
-    setInterval("window.location.reload(true)", 2000);
+    setInterval("window.location.reload(true)", parseInt(localStorage.timeInterval) || 2000);
   </script>
 <% end %>
 <% unless current_path == '' %>

data/web/views/busy.erb

@@ -1,7 +1,16 @@
 <div class="row header">
-  <div class="col-sm-7">
+  <div class="col-sm-8 pull-left">
     <h3><%= t('Processes') %></h3>
   </div>
+  <div class="col-sm-4 pull-right">
+    <form method="POST" style="margin-top: 20px; margin-bottom: 10px;">
+      <div class="btn-group pull-right">
+        <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('QuietAll') %></button>
+        <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('StopAll') %></button>
+      </div>
+    </form>
+  </div>
+</div>
 </div>
 
 <table class="processes table table-hover table-bordered table-striped table-white">
@@ -10,13 +19,24 @@
     <th><%= t('Started') %></th>
     <th><%= t('Threads') %></th>
     <th><%= t('Busy') %></th>
+    <th>&nbsp;</th>
   </thead>
   <% Sidekiq::ProcessSet.new.each_with_index do |process, index| %>
     <tr>
-      <td><%= process['hostname'] %>:<%= process['pid'] %></td>
+      <td><%= "#{process['hostname']}:#{process['pid']}" %></td>
       <td><%= relative_time(Time.at(process['started_at'])) %></td>
       <td><%= process['concurrency'] %></td>
       <td><%= process['busy'] %></td>
+      <td>
+        <div class="btn-group pull-right">
+          <form method="POST">
+            <input type="hidden" name="hostname" value="<%= process['hostname'] %>"/>
+            <input type="hidden" name="pid" value="<%= process['pid'] %>"/>
+            <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
+            <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
+          </form>
+        </div>
+      </td>
     </tr>
   <% end %>
 </table>
@@ -33,21 +53,22 @@
     <th><%= t('TID') %></th>
     <th><%= t('JID') %></th>
     <th><%= t('Queue') %></th>
-    <th><%= t('Class') %></th>
+    <th><%= t('Job') %></th>
     <th><%= t('Arguments') %></th>
     <th><%= t('Started') %></th>
   </thead>
   <% workers.each_with_index do |(process, thread, msg), index| %>
+    <% job = Sidekiq::Job.new(msg['payload']) -%>
     <tr>
       <td><%= process %></td>
       <td><%= thread %></td>
-      <td><%= msg['payload']['jid'] %></td>
+      <td><%= job.jid %></td>
       <td>
         <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
       </td>
-      <td><%= msg['payload']['class'] %></td>
+      <td><%= job.display_class %></td>
       <td>
-        <div class="args"><%= display_args(msg['payload']['args']) %></div>
+        <div class="args"><%= display_args(job.display_args) %></div>
       </td>
       <td><%= relative_time(Time.at(msg['run_at'])) %></td>
     </tr>