sidekiq-hierarchy 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 207932da2b55a42c996a64475325af922be4c036
-  data.tar.gz: 7d544e96ac3849b5df2791cddcdf3fd320dfc4f9
+  metadata.gz: 9f9e018911b28e3e2676fe129484f15e109a68f7
+  data.tar.gz: 920d077b333de9929a2319f714c74137dd63fc29
 SHA512:
-  metadata.gz: c491a5c80b0a32e1707b34acf4977affcf924e89eb58f6d8b4f91d7be1b05e144ec7532cf911e417fff5bd0db42b9fa5bcc14dd96ce1cf2bce44ab7fdf35df70
-  data.tar.gz: 809a71fc2054b185bed9100f60d88b19aa6ac65892eb77ebe0da2eeb85ece11a8942b37470cd882d4daf0c657f22235fa3ed85ef516a25dcf836eb6aadfc6121
+  metadata.gz: 566190836db128a3a3e86d166eb43b4fba29412e35f9c6103751e8460d2cfb982621a9ba3acf98d4253b18935982b42536c6de0ec98fd462c3a51f31d36191ca
+  data.tar.gz: ce89fe04d64f1785e8af2a305b41b1e870dfc7e02d44152f802ff6621175e2e92ab318d1535e8d563d9f37c491c934da5aa0d7ed9275d3fe7571e48c38485332

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .sw?
+/demo_app

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [0.1.3] - 2015-11-19
+### Changed
+- Fixed workflow-enabled jobs spawned by untracked jobs, which should therefore be considered roots on their own
+- Modified web view to display total size of each workflow set
+
 ## [0.1.2] - 2015-11-17
 ### Changed
 - Fixed compatibility with older Sidekiq/middleware versions that don't support alternate redis pools

data/lib/sidekiq/hierarchy/faraday/middleware.rb

@@ -6,8 +6,10 @@ module Sidekiq
     module Faraday
       class Middleware < ::Faraday::Middleware
         def call(env)
-          env[:request_headers][Sidekiq::Hierarchy::Http::JID_HEADER] = Sidekiq::Hierarchy.current_jid if Sidekiq::Hierarchy.current_jid
-          env[:request_headers][Sidekiq::Hierarchy::Http::WORKFLOW_HEADER] = Sidekiq::Hierarchy.current_workflow.jid if Sidekiq::Hierarchy.current_workflow
+          if Sidekiq::Hierarchy.current_workflow && Sidekiq::Hierarchy.current_jid
+            env[:request_headers][Sidekiq::Hierarchy::Http::JID_HEADER] = Sidekiq::Hierarchy.current_jid
+            env[:request_headers][Sidekiq::Hierarchy::Http::WORKFLOW_HEADER] = Sidekiq::Hierarchy.current_workflow.jid
+          end
           @app.call(env)
         end
       end

data/lib/sidekiq/hierarchy/rack/middleware.rb

@@ -14,8 +14,10 @@ module Sidekiq
         end
 
         def call(env)
-          Sidekiq::Hierarchy.current_jid = env[JID_HEADER_KEY]
-          Sidekiq::Hierarchy.current_workflow = Workflow.find_by_jid(env[WORKFLOW_HEADER_KEY]) if env[WORKFLOW_HEADER_KEY]
+          if env[WORKFLOW_HEADER_KEY] && env[JID_HEADER_KEY]
+            Sidekiq::Hierarchy.current_jid = env[JID_HEADER_KEY]
+            Sidekiq::Hierarchy.current_workflow = Workflow.find_by_jid(env[WORKFLOW_HEADER_KEY])
+          end
           @app.call(env)
         ensure
           Sidekiq::Hierarchy.current_workflow = nil

data/lib/sidekiq/hierarchy/server/middleware.rb

@@ -14,10 +14,11 @@ module Sidekiq
         def call(worker, msg, queue)
           if msg['workflow'] == true  # root job -- start of a new workflow
             Sidekiq::Hierarchy.current_workflow = Workflow.find_by_jid(worker.jid)
+            Sidekiq::Hierarchy.current_jid = worker.jid
           elsif msg['workflow'].is_a?(String)  # child job -- inherit parent's workflow
             Sidekiq::Hierarchy.current_workflow = Workflow.find_by_jid(msg['workflow'])
+            Sidekiq::Hierarchy.current_jid = worker.jid
           end
-          Sidekiq::Hierarchy.current_jid = worker.jid
 
           Sidekiq::Hierarchy.record_job_running
           ret = yield

data/lib/sidekiq/hierarchy/version.rb

@@ -1,5 +1,5 @@
 module Sidekiq
   module Hierarchy
-    VERSION = '0.1.2'
+    VERSION = '0.1.3'
   end
 end

data/lib/sidekiq/hierarchy/web.rb

@@ -61,13 +61,13 @@ module Sidekiq
         end
 
         app.get '/hierarchy/?' do
-          running_set = RunningSet.new
-          complete_set = CompleteSet.new
-          failed_set = FailedSet.new
+          @running_set = RunningSet.new
+          @complete_set = CompleteSet.new
+          @failed_set = FailedSet.new
 
-          @running = running_set.each.take(PER_PAGE)
-          @complete = complete_set.each.take(PER_PAGE)
-          @failed = failed_set.each.take(PER_PAGE)
+          @running = @running_set.each.take(PER_PAGE)
+          @complete = @complete_set.each.take(PER_PAGE)
+          @failed = @failed_set.each.take(PER_PAGE)
 
           erb sidekiq_hierarchy_template(:status)
         end
@@ -79,8 +79,8 @@ module Sidekiq
 
         app.get '/hierarchy/workflow_sets/:status' do |status|
           @status = status.to_sym
-          if workflow_set = WorkflowSet.for_status(@status)
-            @workflows = workflow_set.each.take(PER_PAGE)
+          if @workflow_set = WorkflowSet.for_status(@status)
+            @workflows = @workflow_set.each.take(PER_PAGE)
             erb sidekiq_hierarchy_template(:workflow_set)
           else
             halt 404

data/web/views/status.erb

@@ -6,7 +6,8 @@
 <div class="panel panel-info">
   <div class="panel-heading">
     <a href="<%= workflow_set_url(:running) %>">
-      <h4>Running Workflows</h4>
+      <h4 style="display:inline">Running Workflows</h4>
+      (<%= @running_set.size %> total, displaying <%= @running.size %> newest)
     </a>
   </div>
 
@@ -42,7 +43,8 @@
 <div class="panel panel-success">
   <div class="panel-heading">
     <a href="<%= workflow_set_url(:complete) %>">
-      <h4>Complete Workflows</h4>
+      <h4 style="display:inline">Complete Workflows</h4>
+      (<%= @complete_set.size %> total, displaying <%= @complete.size %> newest)
     </a>
   </div>
 
@@ -82,7 +84,8 @@
 <div class="panel panel-danger">
   <div class="panel-heading">
     <a href="<%= workflow_set_url(:failed) %>">
-      <h4>Failed Workflows</h4>
+      <h4 style="display:inline">Failed Workflows</h4>
+      (<%= @failed_set.size %> total, displaying <%= @failed.size %> newest)
     </a>
   </div>
 

data/web/views/workflow_set.erb

@@ -1,3 +1,5 @@
 <h3><%= @status.to_s.capitalize %> Workflows</h3>
 
 <%= erb sidekiq_hierarchy_template(:_workflow_table), locals: {workflows: @workflows} %>
+
+Displaying <%= @workflows.size %> newest of <%= @workflow_set.size %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-hierarchy
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Anuj Das
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2015-11-17 00:00:00.000000000 Z
+date: 2015-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement