boy_band 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23c62fbe933f39268eb29e8ed847e5d1ad024d72f8a1d8440ffd8a3c016f5808
-  data.tar.gz: 0b6f927fcdbe7671e208413c334a4281753d34eafbfc3aa41f156a5c63623dfe
+  metadata.gz: d7584b735b0671735458dcf190fac4d6469b4fc3e165e9df54f909bceaa89b83
+  data.tar.gz: 691d966ef8eabf44ec431cf4a182ca81b10202c17f96c0f88d5a702ff6492eb6
 SHA512:
-  metadata.gz: 5f7da0fc9ac9bfd01e30ed1f47e9477d2a615ab0b5a0347876a38c4c1baccd8c0ad6ff4b980b46f7433878b2bc03bdf595d7279e62ccda4af886a15ddbe002db
-  data.tar.gz: 7ff7fe92e9ae36ba9f979790c65da96e59a45628e85173f724cc50d5e81e9f168218a25318fdad3481d4d7af84cfd99f696539cf992e8632d4ead9efc395f451
+  metadata.gz: 06723c500fc807e94c6f1937154033dd87d82f9c3ce53d4cc699a4b6071ddbb3f180100a2d9a0cb002dee06b87c9a8248326b8de84cf03953d54423e8e44197e
+  data.tar.gz: 61166b0bc26eae3181cbf10f195bfb461199cc0f40839f7717a8765abac549dc632826bf2160dc4fef5bff08fec1ffb8c528c999746da2e3b5cfcdb47105329e

data/lib/boy_band.rb

@@ -16,7 +16,7 @@ module BoyBand
       PaperTrail.whodunnit = name
     end
   end
-  
+
   module WorkerMethods
     def thread_id
       "#{Process.pid}_#{Thread.current.object_id}"
@@ -31,12 +31,34 @@ module BoyBand
       @@domain_id = val
     end
   
+    def job_chain
+      @@job_chain ||= "none"
+      @@job_chain
+    end
+
+    def set_job_chain(val)
+      @@job_chain = val
+    end
+  
     def schedule_for(queue, klass, method_name, *args)
       @queue = queue.to_s
       job_hash = Digest::MD5.hexdigest(args.to_json)
       note_job(job_hash)
       size = Resque.size(queue)
       args.push("domain::#{self.domain_id}")
+      chain = self.job_chain.split(/##/)
+      job_id = "j#{Time.now.iso8601}_#{rand(9999)}"
+      chain = [job_id] if chain == ["none"]
+      if chain.length > 1
+        Resque.redis.incr("jobs_from_#{chain[0]}") 
+        Resque.redis.expire("jobs_from_#{chain[0]}", 24.hours.to_i)
+      end
+      chain.push("#{klass.to_s},#{method_name.to_s},#{args.join('+')}")
+      Rails.logger.warn("jobchain set, #{chain[0]} #{chain.join('##')}") if chain.length > 1
+      if chain.length > 5
+        Rails.logger.error("jobchain too long: job_id, #{chain.length} entries")
+      end
+      args.push("chain::#{chain.join('##')}")
       if queue == :slow
         Resque.enqueue(SlowWorker, klass.to_s, method_name, *args)
         if size > 1000 && !Resque.redis.get("queue_warning_#{queue}")
@@ -88,7 +110,10 @@ module BoyBand
   
     def perform_at(speed, *args)
       args_copy = [] + args
-      if args[-1].is_a?(String) && args[-1].match(/^domain::/)
+      if args_copy[-1].is_a?(String) && args_copy[-1].match(/^chain::/)
+        set_job_chain(args_copy.pop.split(/::/, 2)[1])
+      end
+      if args_copy[-1].is_a?(String) && args_copy[-1].match(/^domain::/)
         set_domain_id(args_copy.pop.split(/::/, 2)[1])
       end
       klass_string = args_copy.shift
@@ -112,6 +137,7 @@ module BoyBand
       elsif diff > 60*10 && speed == :slow
         Rails.logger.error("long-running job, #{action} (expected slow), #{diff}s")
       end
+      set_job_chain("none")
       BoyBand.set_job_instigator(pre_whodunnit)
       clear_job(job_hash)
     rescue Resque::TermException
@@ -136,6 +162,9 @@ module BoyBand
         idx = Resque.size(queue)
         idx.times do |i|
           item = Resque.peek(queue, i)
+          if item['args'] && item['args'][-1].match(/^chain::/)
+            chain = item['args'].pop
+          end
           if item['args'] && item['args'][-1].match(/^domain::/)
             domain = item['args'].pop
             item['domain_id'] = domain.split(/::/, 2)[1]
@@ -148,6 +177,9 @@ module BoyBand
   
     def scheduled_for?(queue, klass, method_name, *args)
       args_copy = [] + args
+      if args[-1].is_a?(String) && args[-1].match(/^chain::/)
+        args_copy.pop.split(/::/, 2)[1]
+      end
       if args[-1].is_a?(String) && args[-1].match(/^domain::/)
         set_domain_id(args_copy.pop.split(/::/, 2)[1])
       end
@@ -173,6 +205,7 @@ module BoyBand
                 a1[0].delete('domain_id')
               end
               a2 = schedule['args'][2..-1]
+              a2.pop if a2.length > 1 && a2[-1].is_a?(String) && a2[-1].match(/^chain::/)
               a2.pop if a2.length > 1 && a2[-1].is_a?(String) && a2[-1].match(/^domain::/)
               if a2.length == 1 && a2[0].is_a?(Hash)
                 a2 = [a2[0].dup]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boy_band
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-15 00:00:00.000000000 Z
+date: 2020-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails