canvas_sync 0.17.23 → 0.17.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e0b64f56f9bd68aa468f8bd608000f622c07a0dbcf1a49469435788e5708545
-  data.tar.gz: 48bd87ac7843bf65f5e4ac11bc5271a96a032244edcb2996e710006ecf007801
+  metadata.gz: ff1d01575608d114952bb12803cae01cc2f4ff61c8ffeed78f18b247973926fa
+  data.tar.gz: ba3629041f491bb7bac12e03da3c896563c9595c77b58cec0d0c728f97168fcf
 SHA512:
-  metadata.gz: 37835e33df63bbca5a712535b1fa32574e7f6d80a186cdb1e1638b5232ccb8f96cf36c95ae10483e7e519a0ddfee7334f91cd323757302da0304d15205274a62
-  data.tar.gz: 785bc9a767cad6b750c23dc16f7f5fec58e88c5fb8defe7156e7931c31ee5093de25c864aa9c4b2dd6aa72f884fbbc28fcd707dfda59a8f048d551c1a8c0d361
+  metadata.gz: 73ef3c21b2bb55276da6d5bd96a13b089117e47a04a117d4533822dc790eb2a62b2f8ac88fbfe122a4292e801542c49facef12554fd9a7c80426f699125d42b2
+  data.tar.gz: 29be22e24cb562c9decae8986b5e8a2b7f09da39a80e019edfe6f3cc994a90a2d53da1c9bae4e3d56640d630d7fbd8abca43e8bf946d35c211dae0a00833ef91

data/lib/canvas_sync/job_batches/batch.rb

@@ -19,6 +19,8 @@ require_relative "./chain_builder"
 
 module CanvasSync
   module JobBatches
+    CURRENT_BATCH_THREAD_KEY = :job_batches_batch
+
     class Batch
       include RedisModel
 
@@ -89,7 +91,7 @@ module CanvasSync
         raise NoBlockGivenError unless block_given?
 
         if !@existing && !@initialized
-          parent_bid = Thread.current[:batch]&.bid
+          parent_bid = Thread.current[CURRENT_BATCH_THREAD_KEY]&.bid
 
           redis.multi do |r|
             r.hset(@bidkey, "parent_bid", parent_bid.to_s) if parent_bid
@@ -111,11 +113,11 @@ module CanvasSync
         end
 
         begin
-          parent = Thread.current[:batch]
-          Thread.current[:batch] = self
+          parent = Thread.current[CURRENT_BATCH_THREAD_KEY]
+          Thread.current[CURRENT_BATCH_THREAD_KEY] = self
           yield
         ensure
-          Thread.current[:batch] = parent
+          Thread.current[CURRENT_BATCH_THREAD_KEY] = parent
         end
 
         nil
@@ -179,11 +181,11 @@ module CanvasSync
 
       def self.with_batch(batch)
         batch = self.new(batch) if batch.is_a?(String)
-        parent = Thread.current[:batch]
-        Thread.current[:batch] = batch
+        parent = Thread.current[CURRENT_BATCH_THREAD_KEY]
+        Thread.current[CURRENT_BATCH_THREAD_KEY] = batch
         yield
       ensure
-        Thread.current[:batch] = parent
+        Thread.current[CURRENT_BATCH_THREAD_KEY] = parent
       end
 
       # Any Batches or Jobs created in the given block won't be assocaiated to the current batch
@@ -228,6 +230,14 @@ module CanvasSync
       end
 
       class << self
+        def current
+          Thread.current[CURRENT_BATCH_THREAD_KEY]
+        end
+
+        def current_context
+          current&.context || {}
+        end
+
         def process_failed_job(bid, jid)
           _, pending, failed, children, complete, parent_bid = redis do |r|
             return unless r.exists?("BID-#{bid}")

data/lib/canvas_sync/job_batches/batch_aware_job.rb

@@ -6,17 +6,17 @@ module CanvasSync
       included do
         around_perform do |job, block|
           if (@bid) # This _must_ be @bid - not just bid
-            prev_batch = Thread.current[:batch]
+            prev_batch = Thread.current[CURRENT_BATCH_THREAD_KEY]
             begin
-              Thread.current[:batch] = Batch.new(@bid)
+              Thread.current[CURRENT_BATCH_THREAD_KEY] = Batch.new(@bid)
               block.call
-              Thread.current[:batch].save_context_changes
+              Thread.current[CURRENT_BATCH_THREAD_KEY].save_context_changes
               Batch.process_successful_job(@bid, job_id)
             rescue
               Batch.process_failed_job(@bid, job_id)
               raise
             ensure
-              Thread.current[:batch] = prev_batch
+              Thread.current[CURRENT_BATCH_THREAD_KEY] = prev_batch
             end
           else
             block.call
@@ -24,7 +24,7 @@ module CanvasSync
         end
 
         around_enqueue do |job, block|
-          if (batch = Thread.current[:batch])
+          if (batch = Thread.current[CURRENT_BATCH_THREAD_KEY])
             @bid = batch.bid
             batch.increment_job_queue(job_id) if @bid
           end
@@ -33,11 +33,11 @@ module CanvasSync
       end
 
       def bid
-        @bid || Thread.current[:batch]&.bid
+        @bid || Thread.current[CURRENT_BATCH_THREAD_KEY]&.bid
       end
 
       def batch
-        Thread.current[:batch]
+        Thread.current[CURRENT_BATCH_THREAD_KEY]
       end
 
       def batch_context

data/lib/canvas_sync/job_batches/sidekiq.rb

@@ -8,11 +8,11 @@ module CanvasSync
     module Sidekiq
       module WorkerExtension
         def bid
-          Thread.current[:batch].bid
+          Thread.current[CURRENT_BATCH_THREAD_KEY].bid
         end
 
         def batch
-          Thread.current[:batch]
+          Thread.current[CURRENT_BATCH_THREAD_KEY]
         end
 
         def batch_context
@@ -42,7 +42,7 @@ module CanvasSync
 
       class ClientMiddleware
         def call(_worker, msg, _queue, _redis_pool = nil)
-          if (batch = Thread.current[:batch]) && should_handle_batch?(msg)
+          if (batch = Thread.current[CURRENT_BATCH_THREAD_KEY]) && should_handle_batch?(msg)
             batch.increment_job_queue(msg['jid']) if (msg[:bid] = batch.bid)
           end
           yield
@@ -57,17 +57,17 @@ module CanvasSync
       class ServerMiddleware
         def call(_worker, msg, _queue)
           if (bid = msg['bid'])
-            prev_batch = Thread.current[:batch]
+            prev_batch = Thread.current[CURRENT_BATCH_THREAD_KEY]
             begin
-              Thread.current[:batch] = Batch.new(bid)
+              Thread.current[CURRENT_BATCH_THREAD_KEY] = Batch.new(bid)
               yield
-              Thread.current[:batch].save_context_changes
+              Thread.current[CURRENT_BATCH_THREAD_KEY].save_context_changes
               Batch.process_successful_job(bid, msg['jid'])
             rescue
               Batch.process_failed_job(bid, msg['jid'])
               raise
             ensure
-              Thread.current[:batch] = prev_batch
+              Thread.current[CURRENT_BATCH_THREAD_KEY] = prev_batch
             end
           else
             yield

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.23".freeze
+  VERSION = "0.17.24".freeze
 end