canvas_sync 0.17.0.beta6 → 0.17.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00bad4ee593106421544ae0ec2e99c8d5376c48450ce924774f00bc936130bee
-  data.tar.gz: 21341abba869bf4c375b5d7fa00d5c165b6901fc38bcbe76c1bff9873ef2437d
+  metadata.gz: 92aceb45ca42ac3cedcb449ea12ee0c04f437239ccc7375995f56939216ea473
+  data.tar.gz: 37b66818e5ba35d6b0d159ef817cbaf3c8bf66b8194e21c85876f2fdebaa30a0
 SHA512:
-  metadata.gz: e9def679518392df1a99842b1afa51b0804718ebc7c5b8d652001c5b4fa07463171cb14ba187c092b78c4abf6cc127184fa2ba752a473b14e0330cdd0ff8182c
-  data.tar.gz: d4e0b07807371ab31c55527aeee07ef756708bd2acccd0de4467f8bc15473e70de0a552caa704b4cb805b06aa98edb6cc49a80c67a5b51b3a029056e736236ce
+  metadata.gz: 22b6826841d14ef7c9bbde34ba0d17484183a8f48247167b08b4332ced3b2b8e5bff7d2d4ea6e6e8246ea720efd79998b46768c973303094839104804c827e26
+  data.tar.gz: da90ec118b97081ce4f54de372e288d0033f76d91e1401ef1bcf70d7a62d589a0e08df18a83030da4e2f0b14bffe51cc33b3b97c198ec7f70f58874b118c2fd2

data/lib/canvas_sync/job_batches/batch.rb

@@ -118,7 +118,7 @@ module CanvasSync
           @initialized = true
         end
 
-        @ready_to_queue = []
+        job_queue = @ready_to_queue = []
 
         puts "Beginning Batch #{@bidkey}"
 
@@ -127,33 +127,20 @@ module CanvasSync
           Thread.current[:batch] = self
           yield
         ensure
+          @ready_to_queue = nil
+          append_jobs(job_queue)
           Thread.current[:batch] = parent
         end
 
-        redis do |r|
-          r.multi do
-            if parent_bid
-              r.hincrby("BID-#{parent_bid}", "children", 1)
-              r.hincrby("BID-#{parent_bid}", "total", @ready_to_queue.size)
-              r.expire("BID-#{parent_bid}", BID_EXPIRE_TTL)
-            end
-
-            r.hincrby(@bidkey, "pending", @ready_to_queue.size)
-            r.hincrby(@bidkey, "total", @ready_to_queue.size)
-            r.expire(@bidkey, BID_EXPIRE_TTL)
-
-            if @ready_to_queue.size > 0
-              r.sadd(@bidkey + "-jids", @ready_to_queue)
-              r.expire(@bidkey + "-jids", BID_EXPIRE_TTL)
-            end
-          end
-        end
-
-        @ready_to_queue
+        job_queue
       end
 
       def increment_job_queue(jid)
-        @ready_to_queue << jid
+        if @ready_to_queue
+          @ready_to_queue << jid
+        else
+          append_jobs([jid])
+        end
       end
 
       def invalidate_all
@@ -216,6 +203,27 @@ module CanvasSync
         @pending_attrs = {}
       end
 
+      def append_jobs(jids)
+        redis do |r|
+          r.multi do
+            if parent_bid
+              r.hincrby("BID-#{parent_bid}", "children", 1)
+              r.hincrby("BID-#{parent_bid}", "total", jids.size)
+              r.expire("BID-#{parent_bid}", BID_EXPIRE_TTL)
+            end
+
+            r.hincrby(@bidkey, "pending", jids.size)
+            r.hincrby(@bidkey, "total", jids.size)
+            r.expire(@bidkey, BID_EXPIRE_TTL)
+
+            if jids.size > 0
+              r.sadd(@bidkey + "-jids", jids)
+              r.expire(@bidkey + "-jids", BID_EXPIRE_TTL)
+            end
+          end
+        end
+      end
+
       class << self
         def process_failed_job(bid, jid)
           _, pending, failed, children, complete, parent_bid = redis do |r|
@@ -361,19 +369,19 @@ module CanvasSync
 
         def cleanup_redis(bid)
           logger.debug {"Cleaning redis of batch #{bid}"}
-          redis do |r|
-            r.del(
-              "BID-#{bid}",
-              "BID-#{bid}-callbacks-complete",
-              "BID-#{bid}-callbacks-success",
-              "BID-#{bid}-failed",
-
-              "BID-#{bid}-batches-success",
-              "BID-#{bid}-batches-complete",
-              "BID-#{bid}-batches-failed",
-              "BID-#{bid}-jids",
-            )
-          end
+          # redis do |r|
+          #   r.del(
+          #     "BID-#{bid}",
+          #     "BID-#{bid}-callbacks-complete",
+          #     "BID-#{bid}-callbacks-success",
+          #     "BID-#{bid}-failed",
+
+          #     "BID-#{bid}-batches-success",
+          #     "BID-#{bid}-batches-complete",
+          #     "BID-#{bid}-batches-failed",
+          #     "BID-#{bid}-jids",
+          #   )
+          # end
         end
 
         def redis(*args, &blk)

data/lib/canvas_sync/version.rb

@@ -1,3 +1,3 @@
 module CanvasSync
-  VERSION = "0.17.0.beta6".freeze
+  VERSION = "0.17.0.beta7".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canvas_sync
 version: !ruby/object:Gem::Version
-  version: 0.17.0.beta6
+  version: 0.17.0.beta7
 platform: ruby
 authors:
 - Nate Collings