sidekiq-queue-stats 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 026c2ff9f949d48ada4885f8e7dae2b4679389bd
-  data.tar.gz: 4fcdbfad5a850932a63b55c850780ed07e1b64f8
+  metadata.gz: 51e57c307b05076c0fbff272ff625e063eb14365
+  data.tar.gz: 106453857a501e1a0d20a395b3ca3e7573ede51f
 SHA512:
-  metadata.gz: 220467b4fda45cf4809e1126795ae03990ac82e11b0362ff9896aa044b75deaaf4de95f181a0e944aa9a2d31d3058c7eb2ecf3804046123034f9da0250852f9c
-  data.tar.gz: 3e8e08b53beb70950bbdab3640b14b3b1e46e4e8acdba1be8136f6646aa8642e85aa4f75283adb1efae6027f93112757820e3d59674d39fc58436bf227169ac6
+  metadata.gz: 60d1d2482649a54b3204dda12cbbac5c31d72695c9a7a85edf934473526c2b5991792fd4a5d5a7134829c4fb85054b874a28e3d3cec7e07c6c671c1030504086
+  data.tar.gz: 0de12313c8889f37d8af4311d7645b9b151b0e1fa2e6a772b485002d94f8f6638234287e495fbdbd4651654a1452f6ef76fc7aed9d2540a5d8403aceba951f16

data/lib/sidekiq/queue_stats/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module QueueStats
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/lib/sidekiq/queue_stats/views/queue_stats.erb

@@ -1,26 +1,27 @@
 <header class="row">
-  <div class="col-sm-5">
+  <div class="col-sm-10">
     <h3>Queue Stats</h3>
   </div>
+  <div class="dropdown col-sm-2">
+    <button class="btn btn-default dropdown-toggle pull-right" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+      Queues
+      <span class="caret"></span>
+    </button>
+    <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+      <li><a href="?">All</a></li>
+      <% @qs.each do |q| %>
+        <li><a href=<%="?queue=#{q.downcase}"%>><%= q.capitalize %></a></li>
+      <% end %>
+    </ul>
+  </div>
 </header>
 
-<div class="dropdown pull-right">
-  <button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
-    Queues
-    <span class="caret"></span>
-  </button>
-  <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
-    <li><a href="#">All</a></li>
-    <% @queues.each do |q| %>
-      <li><a href=<%="?queue=#{q.downcase}"%>><%= q.capitalize %></a></li>
-    <% end %>
-  </ul>
-</div>
+
 
 <%= csrf_tag if respond_to?(:csrf_tag) %>
 <% if params[:queue] %>
-<h4><%= @queue.name.capitalize %></h4>
-  <% if @workers[@queue.name].nil? %>
+  <h4><%= @q.name.capitalize %></h4>
+  <% if @wrks[@q.name].empty? %>
     <div class="alert alert-success">Nothing waiting in queue</div>
   <% else %>
     <table class="table table-striped table-bordered table-white">
@@ -30,7 +31,7 @@
           <th style="width: 150px">Count</th>
         </tr>
       </thead>
-      <% @workers[@queue.name].each do |worker| %>
+      <% @wrks[@q.name].each do |worker| %>
         <tr>
           <td><%=worker.first%></td>
           <td><%=worker.last%></td>
@@ -39,25 +40,29 @@
     </table>
   <% end %>
 <% else %>
-  <% @queues.each do |q| %>
-    <h4><%= q.capitalize %></h4>
-    <% if @workers[q].empty? %>
-     <div class="alert alert-success">Nothing waiting in queue</div>
-    <% else %>
-     <table class="table table-striped table-bordered table-white">
-       <thead>
-         <tr>
-           <th>Name</th>
-           <th style="width: 150px">Count</th>
-         </tr>
-       </thead>
-       <% @workers[q].each do |worker| %>
-         <tr>
-           <td><%=worker.first%></td>
-           <td><%=worker.last%></td>
-         </tr>
-       <% end %>
-     </table>
+  <% if @qs.empty? %>
+    <div class="alert alert-success">Nothing waiting in any queue</div>
+  <% else %>
+    <% @qs.each do |q| %>
+      <h4><%= q.capitalize %></h4>
+      <% if @wrks[q].empty? %>
+       <div class="alert alert-success">Nothing waiting in queue</div>
+      <% else %>
+       <table class="table table-striped table-bordered table-white">
+         <thead>
+           <tr>
+             <th>Name</th>
+             <th style="width: 150px">Count</th>
+           </tr>
+         </thead>
+         <% @wrks[q].each do |worker| %>
+           <tr>
+             <td><%=worker.first%></td>
+             <td><%=worker.last%></td>
+           </tr>
+         <% end %>
+       </table>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>

data/lib/sidekiq/queue_stats/web_extension.rb

@@ -6,20 +6,20 @@ module QueueStats
         view_path = File.join(File.expand_path("..", __FILE__), "views")
 
         app.get "/queue_stats" do
-          @queues = Sidekiq::Queue.all.map(&:name)
-          @workers = {}
+          @qs = Sidekiq::Queue.all.map(&:name)
+          @wrks = {}
 
           if params[:queue]
-            @queue = params[:queue] ? Sidekiq::Queue.new(params[:queue]) : Sidekiq::Queue.new
-            @workers[@queue.name] = Hash.new(0)
-            @queue.each do |job|
-              @workers[@queue.name][job.klass] += 1
+            @q = params[:queue] ? Sidekiq::Queue.new(params[:queue]) : Sidekiq::Queue.new
+            @wrks[@q.name] = Hash.new(0)
+            @q.each do |job|
+              @wrks[@q.name][job.klass] += 1
             end
           else
             Sidekiq::Queue.all.each do |q|
-              @workers[q.name] = Hash.new(0)
+              @wrks[q.name] = Hash.new(0)
               q.each do |job|
-                @workers[q.name][job.klass] += 1
+                @wrks[q.name][job.klass] += 1
               end
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-queue-stats
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Stephens