canvas_sync 0.17.0.beta4 → 0.17.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2fac17ba7660bf59726320af878f6ca00b1d3dba48428677ee01dcaffdf210f
-  data.tar.gz: 05161fb24879704d5d68b7ae45a4a69c848db6c914666a307641de24081e0234
+  metadata.gz: eba7624a65721ad2183b188372b167c47bde879c37c595ef13398e4ec4b835b5
+  data.tar.gz: a69c72c000c782bff566016ca1cc7813c0c1d6829f2516291721672e3ee7d5ec
 SHA512:
-  metadata.gz: d1dbd39ffb4f0a58b90ecf9a36e493d360a88438aa93e7a40429e6a7f0004149c3e77a8da069c72df27f38d4657f769a5f6c309e4230a89db4d810d3afcac9f7
-  data.tar.gz: c4ae094ca61c7698aa95ab2378433ba1f84e1481ef6034fcce129e188c8fa309692cbc4e9a1c7607d38e77f292aad9128d59c5f115258c7f22c5b9d6b0cadd75
+  metadata.gz: 00e85f161794e1526cf734aabaaf364b55b92b93a832248bd8f17b4eeb97081e20fc8ef7e84ae7029dbd654ad46410939d10ec4db5ba79394b9326de49948342
+  data.tar.gz: d30bb87abb822cd0f5ad10b60b6941326ac8a2e964241fa6e8403c5a5bf303e3d6945bd79ff500a181bd21a6805161281f4fe05fdd091f42b295ebf820772362

data/lib/canvas_sync/job_batches/batch.rb

@@ -120,6 +120,8 @@ module CanvasSync
 
         @ready_to_queue = []
 
+        Batch.logger.debug("Beginning Batch #{@bidkey}")
+
         begin
           parent = Thread.current[:batch]
           Thread.current[:batch] = self

data/lib/canvas_sync/job_batches/callback.rb

@@ -145,11 +145,6 @@ module CanvasSync
               end
             end
           end
-
-          def cleanup_redis bid, callback_bid=nil
-            Batch.cleanup_redis bid
-            Batch.cleanup_redis callback_bid if callback_bid
-          end
         end
       end
     end

data/lib/canvas_sync/job_batches/chain_builder.rb

@@ -106,7 +106,7 @@ module CanvasSync
 
       # Legacy Support
       def merge_options(job, options)
-        matching_jobs = find_matching_jobs(sub_type)
+        matching_jobs = find_matching_jobs(job)
 
         matching_jobs.each do |j|
           j[:options] ||= {}

data/lib/canvas_sync/job_batches/jobs/concurrent_batch_job.rb

@@ -5,6 +5,7 @@ module CanvasSync
     class ConcurrentBatchJob < BaseJob
       def perform(sub_jobs, context: nil)
         Batch.new.tap do |b|
+          b.description = "Concurrent Batch Root"
           b.context = context
           b.jobs do
             sub_jobs.each do |j|

data/lib/canvas_sync/job_batches/jobs/serial_batch_job.rb

@@ -21,6 +21,7 @@ module CanvasSync
           end
         end
 
+        root_batch.description = "Serial Batch Root (#{serial_id})"
         root_batch.allow_context_changes = true
         root_batch.context = context
         root_batch.on(:success, "#{self.class.to_s}.cleanup_redis", serial_batch_id: serial_id)
@@ -61,7 +62,8 @@ module CanvasSync
 
         Batch.new(root_bid).jobs do
           Batch.new.tap do |batch|
-            batch.on(:success, "#{self.to_s}.job_succeeded_callback", serial_batch_id: serial_id)
+          batch.description = "Serial Batch Fiber (#{serial_id})"
+          batch.on(:success, "#{self.to_s}.job_succeeded_callback", serial_batch_id: serial_id)
             batch.jobs do
               ChainBuilder.enqueue_job(next_job)
             end

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.0.beta4".freeze
+  VERSION = "0.17.0.beta5".freeze
 end

data/spec/job_batching/flow_spec.rb

@@ -2,19 +2,16 @@ require 'spec_helper'
 
 class WorkerA < BatchTestJobBase
   def perform
-    puts 'A'
   end
 end
 
 class WorkerB < BatchTestJobBase
   def perform
-    puts 'B'
   end
 end
 
 class WorkerC < BatchTestJobBase
   def perform
-    puts 'C'
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.17.0.beta4
+  version: 0.17.0.beta5
 platform: ruby
 authors:
 - Nate Collings
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler