sidekiq-worker_stats 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2dfa84049939f2b9e106c0c952210cc8ca4f775
-  data.tar.gz: 5247578e6a5277f95954a64b002d8e1d9f13b4ab
+  metadata.gz: d8dbc164cd760d7aecfbcbe515060a03d1ab2b92
+  data.tar.gz: 8036d8280edfd1b3d76a1cb4cfa123c5c608c502
 SHA512:
-  metadata.gz: 755fab1f88cbd2e373f706644e9b8f977fbec17804311ccf6f0baa9787feab1f81922392a8fd4fd1e78bc723f6d29a319da2b85494d588a7b4dce8ef9f7e53d3
-  data.tar.gz: 0f513ff1b469ad9e7d948a6e79b0485e9b7dc78f6601a5d310505ece41982bd706c978a2c81a19821e481ef0f22f9d46aaefd838ec9153e0a3474fc524b95742
+  metadata.gz: 6efbfb46e988f9aea64afa3394a284ff739745a1a710456cb1d1ee603772301c1636f0bf4a9c48b77854c4719a1bec0ad842ad9ac7593f1d41540372449b15fb
+  data.tar.gz: 9f31680bd858585897625ed082e19efc14c1a53fe08a761bbc97aea4132d502ee6cc02a28cd7e69ca79fdf3a5ab74ddff222d7cccb01a4882f9537cdb4544b07

data/lib/sidekiq/worker_stats/stats.rb

@@ -14,7 +14,6 @@ module Sidekiq
       attr_reader :stop_t
       attr_reader :walltime
       attr_reader :status
-      attr_reader :page_size
       attr_reader :mem
 
       attr_reader :mem_thr
@@ -27,7 +26,6 @@ module Sidekiq
         @pid = ::Process.pid
         @jid = worker.jid
         @args = msg["args"]
-        @page_size = `getconf PAGESIZE`.to_i
         start
       end
 
@@ -58,7 +56,6 @@ module Sidekiq
           stop: @stop_t,
           walltime: @walltime,
           status: @status,
-          page_size: @page_size,
           mem: @mem
         }
 
@@ -83,7 +80,7 @@ module Sidekiq
       end
 
       def current_memory
-        `awk '{ print $2 }' /proc/#{@pid}/statm`.strip.to_i * @page_size
+        `ps -o rss= -p #{@pid}`.strip.to_i * 1024
       end
 
       # Remove old samples if number of samples > @config.max_samples

data/lib/sidekiq/worker_stats/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module WorkerStats
-    VERSION = '0.0.7'.freeze
+    VERSION = '0.0.8'.freeze
   end
 end

data/lib/sidekiq/worker_stats/views/worker_stats.erb

@@ -1,6 +1,6 @@
 <div class="worker_stats">
   <h2>Worker Stats</h2>
-  <h4>Showing results <%= "#{(@page * @per_page) + 1}" %> to <%= "#{[(@page + 1) * @per_page, @stats_length].min}" %> (Total: <%= "#{@stats_length}" %>)</h4>
+  <h4>Showing results <%= @stats_length == 0 ? "0" : "#{(@page * @per_page) + 1}" %> to <%= "#{[(@page + 1) * @per_page, @stats_length].min}" %> (Total: <%= "#{@stats_length}" %>)</h4>
   <br>
 
   <div style="height: 30px">
@@ -26,9 +26,8 @@
           <th>Started at</th>
           <th>Finished at</th>
           <th>Runtime (s)</th>
-          <th>Start Memory</th>
-          <th>Avg. Memory</th>
-          <th>Peak Memory</th>
+          <th>Start Memory (Mb)</th>
+          <th>Peak Memory (Mb)</th>
         </thead>
 
         <tbody>
@@ -39,9 +38,8 @@
               <td><%= Time.at(worker["start"]).strftime "%Y-%m-%d %H:%M:%S" %></td>
               <td><%= Time.at(worker["stop"]).strftime "%Y-%m-%d %H:%M:%S" %></td>
               <td><%= "#{worker["walltime"].round(4)}" %></td>
-              <td><%= "#{worker["mem"][worker["mem"].keys.min] / 1024 / 1024} Mb" %></td>
-              <td><%= "#{(worker["mem"].values.inject(:+) / worker["mem"].count) / 1024 / 1024} Mb" %></td>
-              <td><%= "#{(worker["mem"].values.max / 1024 / 1024)} Mb" %></td>
+              <td><%= "#{worker["mem"][worker["mem"].keys.min] / 1024 / 1024}" %></td>
+              <td><%= "#{(worker["mem"].values.max / 1024 / 1024)}" %></td>
             </tr>
           <% end %>
         </tbody>

data/lib/sidekiq/worker_stats/views/worker_stats_single.erb

@@ -54,15 +54,15 @@
       <div class="worker_stats__memory_table">
         <table class="table table-hover table-bordered table-striped table-white">
           <thead>
-            <th>Time (after start)</th>
-            <th>Memory</th>
+            <th>Time after start (s)</th>
+            <th>Memory (Mb)</th>
           </thead>
 
           <tbody>
             <% @worker["mem"].each do |time, mem| %>
               <tr>
-                <td><%= (time.to_f - @worker["start"]).round(2).to_s %> seconds</td>
-                <td><%= "#{mem / 1024 / 1024} Mb" %></td>
+                <td><%= (time.to_f - @worker["start"]).round(2).to_s %></td>
+                <td><%= "#{mem / 1024 / 1024}" %></td>
               </tr>
             <% end %>
           </tbody>

data/lib/sidekiq/worker_stats/web.rb

@@ -27,7 +27,7 @@ module Sidekiq
           @workers_stats = @workers_stats.sort_by { |k, v| ::Time.at(v["start"]) }.reverse
           @stats_length = @workers_stats.length
 
-          @max_pages = @workers_stats.length / @per_page
+          @max_pages = (@stats_length / @per_page) - (@stats_length % @per_page == 0 ? 1 : 0)
           @page = @page * @per_page < @workers_stats.length ? @page : @max_pages
          
           down_limit = @page * @per_page

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-worker_stats
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Alexandre Jesus
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq