sidekiq-status 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6b4364f29e4cebdacba46d6266532b800cd0626
-  data.tar.gz: cca02102cb3f156fc54ae6bfd7c737e6bbad9d46
+  metadata.gz: 8a5a67d1f198977c5c62da1f00d692ea3ccef0be
+  data.tar.gz: a8da13f7d2b91592d9cb79f15f65c0702979c342
 SHA512:
-  metadata.gz: 4e124dcb4344613124d2d3b8d58f666e7c1bf9a1c41da241db09bce9823de03486bb6e4c916fc4c5f9dbcd3bc73278715092f7709d5cc18d1f7c82b618607bbf
-  data.tar.gz: e30d1f12e9388db15a59791aabb09e7adba4a461441c24b3a73bf34d4262c4cfb76edf850488bb66ba58800a7bec173b6233dba15412351ea67af8b2996d4ebe
+  metadata.gz: 9e0a5f452cf20f979c8ee5032287eaa94366b3cc4016eccfee976909dff2c7c6afd30eef59f02f72d34ea929371d26418505a3f7d948a30658e49e9f138fbecb
+  data.tar.gz: f9b9c8f88be162c4e222a4ac1a8e9bb64d96ed459065628b761b280e9a83318f68fdd660e27c9667541a7bd2788b10ae3d19f4a3619b9be53a0436ab3fc6148d

data/CHANGELOG

@@ -1,3 +1,4 @@
+Version 0.5.3:Sidekiq some tweaks in web UI, separate redis namespace
 Version 0.5.2:Sidekiq versions up to 3.3.* supported, jobs sorting options in web UI, more ruby versions
 Version 0.5.1:dependencies versions requirements relaxed
 Version 0.5.0:Sidekiq v3 support, redis pools support

data/README.md

@@ -163,7 +163,10 @@ To use `sidekiq-status` inlining, require it too in your `{test,spec}_helper.rb`
 * Jon Moses
 * Wayne Hoover
 * Dylan Robinson
+* Dmitry Novotochinov
+* Mohammed Elalj
+* Ben Sharpe
 
 ## License
 MIT License , see LICENSE for more details.
-© 2012 - 2014 Evgeniy Tsvigun
+© 2012 - 2015 Evgeniy Tsvigun

data/lib/sidekiq-status/storage.rb

@@ -14,8 +14,8 @@ module Sidekiq::Status::Storage
   def store_for_id(id, status_updates, expiration = nil, redis_pool=nil)
     redis_connection(redis_pool) do |conn|
       conn.multi do
-        conn.hmset  id, 'update_time', Time.now.to_i, *(status_updates.to_a.flatten(1))
-        conn.expire id, (expiration || Sidekiq::Status::DEFAULT_EXPIRY)
+        conn.hmset  key(id), 'update_time', Time.now.to_i, *(status_updates.to_a.flatten(1))
+        conn.expire key(id), (expiration || Sidekiq::Status::DEFAULT_EXPIRY)
         conn.publish "status_updates", id
       end[0]
     end
@@ -43,7 +43,7 @@ module Sidekiq::Status::Storage
         match = scan_scheduled_jobs_for_jid jobs, job_id
         unless match.nil?
           conn.zrem "schedule", match
-          conn.del job_id
+          conn.del key(job_id)
           return true # Done
         end
         scan_options[:offset] += BATCH_LIMIT
@@ -58,7 +58,7 @@ module Sidekiq::Status::Storage
   # @return [String] Redis operation status code
   def read_field_for_id(id, field)
     Sidekiq.redis do |conn|
-      conn.hmget(id, field)[0]
+      conn.hmget(key(id), field)[0]
     end
   end
 
@@ -67,7 +67,7 @@ module Sidekiq::Status::Storage
   # @return [Hash] Hash stored in redis
   def read_hash_for_id(id)
     Sidekiq.redis do |conn|
-      conn.hgetall id
+      conn.hgetall key(id)
     end
   end
 
@@ -108,4 +108,8 @@ module Sidekiq::Status::Storage
       end
     end
   end
+
+  def key(id)
+    "sidekiq:status:#{id}"
+  end
 end

data/lib/sidekiq-status/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Status
-    VERSION = "0.5.2"
+    VERSION = '0.5.3'
   end
 end

data/spec/lib/sidekiq-status/client_middleware_spec.rb

@@ -12,14 +12,14 @@ describe Sidekiq::Status::ClientMiddleware do
     it "sets queued status" do
       allow(SecureRandom).to receive(:hex).once.and_return(job_id)
       expect(StubJob.perform_async(:arg1 => 'val1')).to eq(job_id)
-      expect(redis.hget(job_id, :status)).to eq('queued')
+      expect(redis.hget("sidekiq:status:#{job_id}", :status)).to eq('queued')
       expect(Sidekiq::Status::queued?(job_id)).to be_truthy
     end
 
     it "sets status hash ttl" do
       allow(SecureRandom).to receive(:hex).once.and_return(job_id)
       expect(StubJob.perform_async(:arg1 => 'val1')).to eq(job_id)
-      expect(1..Sidekiq::Status::DEFAULT_EXPIRY).to cover redis.ttl(job_id)
+      expect(1..Sidekiq::Status::DEFAULT_EXPIRY).to cover redis.ttl("sidekiq:status:#{job_id}")
     end
 
     context "when redis_pool passed" do

data/spec/lib/sidekiq-status/server_middleware_spec.rb

@@ -20,7 +20,7 @@ describe Sidekiq::Status::ServerMiddleware do
                                 "while in #perform, status = working",
                                 job_id])
       end
-      expect(redis.hget(job_id, :status)).to eq('complete')
+      expect(redis.hget("sidekiq:status:#{job_id}", :status)).to eq('complete')
       expect(Sidekiq::Status::complete?(job_id)).to be_truthy
     end
 
@@ -31,14 +31,14 @@ describe Sidekiq::Status::ServerMiddleware do
           expect(FailingJob.perform_async).to eq(job_id)
         }).to eq([job_id]*3)
       end
-      expect(redis.hget(job_id, :status)).to eq('failed')
+      expect(redis.hget("sidekiq:status:#{job_id}", :status)).to eq('failed')
       expect(Sidekiq::Status::failed?(job_id)).to be_truthy
     end
 
     it "sets status hash ttl" do
       allow(SecureRandom).to receive(:hex).once.and_return(job_id)
       expect(StubJob.perform_async(:arg1 => 'val1')).to eq(job_id)
-      expect(1..Sidekiq::Status::DEFAULT_EXPIRY).to cover redis.ttl(job_id)
+      expect(1..Sidekiq::Status::DEFAULT_EXPIRY).to cover redis.ttl("sidekiq:status:#{job_id}")
     end
   end
 
@@ -52,7 +52,7 @@ describe Sidekiq::Status::ServerMiddleware do
       start_server(:expiration => huge_expiration) do
         StubJob.perform_async(:arg1 => 'val1')
       end
-      expect((Sidekiq::Status::DEFAULT_EXPIRY+1)..huge_expiration).to cover redis.ttl(job_id)
+      expect((Sidekiq::Status::DEFAULT_EXPIRY+1)..huge_expiration).to cover redis.ttl("sidekiq:status:#{job_id}")
     end
 
     it "can be overwritten by worker expiration method" do
@@ -61,7 +61,7 @@ describe Sidekiq::Status::ServerMiddleware do
       start_server(:expiration => huge_expiration) do
         StubJob.perform_async(:arg1 => 'val1')
       end
-      expect((huge_expiration+1)..overwritten_expiration).to cover redis.ttl(job_id)
+      expect((huge_expiration+1)..overwritten_expiration).to cover redis.ttl("sidekiq:status:#{job_id}")
     end
   end
 end

data/spec/lib/sidekiq-status/web_spec.rb

@@ -26,7 +26,7 @@ describe 'sidekiq status web' do
       end
 
       get '/statuses'
-      expect(last_response.status).to eq(200)
+      expect(last_response).to be_ok
       expect(last_response.body).to match(/#{job_id}/)
     end
   end

data/spec/lib/sidekiq-status_spec.rb

@@ -182,8 +182,8 @@ describe Sidekiq::Status do
     end
 
     def expect_2_jobs_ttl_covers(range)
-      expect(range).to cover redis.ttl(plain_sidekiq_job_id)
-      expect(range).to cover redis.ttl(job_id_1)
+      expect(range).to cover redis.ttl("sidekiq:status:#{plain_sidekiq_job_id}")
+      expect(range).to cover redis.ttl("sidekiq:status:#{job_id_1}")
     end
 
     def expect_2_jobs_are_done_and_status_eq(status)

data/spec/support/test_jobs.rb

@@ -34,7 +34,7 @@ end
 class ConfirmationJob < StubJob
   def perform(*args)
     Sidekiq.redis do |conn|
-      conn.publish "job_messages_#{jid}", "while in #perform, status = #{conn.hget jid, :status}"
+      conn.publish "job_messages_#{jid}", "while in #perform, status = #{conn.hget "sidekiq:status:#{jid}", :status}"
     end
   end
 end

data/web/views/statuses.erb

@@ -1,36 +1,50 @@
+
 <style>
-.sorted_asc:after{
-  content: " ↑";
+.progress {
+  background-color: #C8E1ED;
+}
+.bar {
+  background-color: #2897cb; 
 }
-.sorted_desc:after{
-  content: " ↓";
+.message {
+  text-shadow: 0 0 5px white;
+  font-weight: bold; padding-left: 4px;
+  color: #333;
 }
 </style>
 
 <h3 class="wi">Recent job statuses</h3>
+
+
 <table class="table table-striped table-bordered">
   <tr>
-    <% @headers.each do |header| %>
-      <th><a href="<%= header[:url] %>" class="<%= header[:class] %>"><%= header[:name] %></a></th>
-    <% end %>
+    <th>Worker/jid</th>
+    <th style='text-align:center;'>Status</th>
+    <th style='width: 10%; text-align:center;'>Last Updated</th>
+    <th style='width: 50%;'>Progress</th>
   </tr>
   <% @statuses.each do |container| %>
     <tr>
-      <td>
-          <%= container.worker %>
-          <br />
-          <%= container.jid %>
+      <td><span title='<%= container.jid %>'><%= container.worker %></span></td>
+      <td style='text-align: center;'><span class='badge'><%= container.status %></span></td>
+      <% secs = Time.now.to_i - container.update_time.to_i %>
+      <td style='text-align: center;'>
+        <% if secs > 0 %>
+          <%= secs %> sec<%= secs == 1 ? '' : 's' %> ago
+        <% else %>
+          Now
+        <% end %>
       </td>
-      <td><%= container.status %></td>
-      <td><%= Time.at(container.update_time.to_i) %></td>
       <td>
         <div class="progress progress-striped" style="margin-bottom: 0">
-          <div class="bar" style="width: <%= container.pct_complete %>%; text-shadow: 1px 1px 1px black; background-color: #AD003D;
-color: white;">
-            <%= container.pct_complete %>%
-          </div>
+          <div class='message' style='text-align:right; padding-right:0.5em; background-color: transparent; float:right;'><%= container.message %></div>
+          <% if container.pct_complete.to_i > 0 %>
+            <div class="bar message" style="width: <%= container.pct_complete %>%; color: white; text-shadow: 0 0 0;">
+              <%= container.pct_complete %>%
+            </div>
+          <% end %>
         </div>
-      <td><%= container.message %></td>
+      </td>
     </tr>
   <% end %>
   <% if @statuses.empty? %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-status
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Evgeniy Tsvigun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: An extension to the sidekiq message processing to track your jobs