boy_band 0.1.10 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bb0ed487c254092a58036d84d154080993a6d82a8fc21db12e69781643fc614
-  data.tar.gz: a2f5dd392d8d591205cdf2b0d75b0682ef82f5f1ac7fa759f44533a057b2d847
+  metadata.gz: 336f5c63c5ed28315ec34a2cba67c8dc9405a086a5b726eaa7ef225692b8cd81
+  data.tar.gz: 230890fc8b4b23f7e7c2510587333fc96f315d300dac2596f6637210458015fb
 SHA512:
-  metadata.gz: 21f05cb1669ac54fdc77668a0b80708092e997a832abc504872c2be5aee145b66e3bd3ff4a79b80dafb6ede62a6838d0785de9665db9e8de00f51acaf5f55fa6
-  data.tar.gz: 06c726f35e6c6dafe8ee6baa8ac6ec7acc37b12980b85b5f9712ec132af92912079625050cb0b9d739b3c5cc13428e2ff55dc28c3ac62519bf310cdd685a1892
+  metadata.gz: e93e0671fc8314c49f92bbdd290e4053a53894fab37b1d75e3232af87099b2c8646d2c096e918bdb94fa258a29145a9d05aba75f6d3b5c1c038192d159c71215
+  data.tar.gz: f39f01817a3cb7157162597532621e43a69721bd89fe3aabe2c79f27bdf986f96fd403f65e7631ab561fc9bcebe25537f168d03f9d992c20969ac8e84a7d25b6

data/lib/boy_band.rb

@@ -63,16 +63,21 @@ module BoyBand
         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 > 2
+      Resque.redis.setex("scheduled/#{klass.to_s}/#{job_hash}", 6.hours, "t")
+      chain_args = args[0..-2]
+      if chain_args.length == 1 && chain_args[0].is_a?(Hash)
+        chain_args = [chain_args[0]['method'],chain_args[0]['id'],chain_args[0]['arguments'].to_s[0, 20]]
+      end
+      chain.push("#{klass.to_s},#{method_name.to_s},#{chain_args.join('+')}")
+      # Rails.logger.warn("jobchain set, #{chain[0]} #{chain.join('##')}") if chain.length > 2
       if chain.length > 5
-        Rails.logger.error("jobchain too deep: #{chain[0]}, #{chain.length} entries")
+        Rails.logger.error("jobchain too deep: #{chain[1]}, #{chain.length} entries")
       end
       job_count = Resque.redis.get("jobs_from_#{chain[0]}")
       if job_count && job_count.to_i > 50
-        Rails.logger.error("jobchain too many sub-jobs: #{chain[0]}, #{job_count} so far")
+        Rails.logger.error("jobchain too many sub-jobs: #{chain[1]}, #{job_count} so far")
       end
-      args.push("chain::#{chain.join('##')}")
+      args.push("chain::#{chain[0, 50].join('##')}")
       if queue == :slow
         Resque.enqueue(SlowWorker, klass.to_s, method_name, *args)
         if size > 1000 && !Resque.redis.get("queue_warning_#{queue}")
@@ -121,8 +126,13 @@ module BoyBand
     def in_worker_process?
       BoyBand.job_instigator.match(/^job/)
     end
+
+    def current_speed
+      @speed
+    end
   
     def perform_at(speed, *args)
+      @speed = speed
       args_copy = [] + args
       if args_copy[-1].is_a?(String) && args_copy[-1].match(/^chain::/)
         set_job_chain(args_copy.pop.split(/::/, 2)[1])
@@ -134,6 +144,7 @@ module BoyBand
       klass = Object.const_get(klass_string)
       method_name = args_copy.shift
       job_hash = Digest::MD5.hexdigest(args_copy.to_json)
+      Resque.redis.del("scheduled/#{klass_string}/#{method_name}/#{job_hash}")
       hash = args_copy[0] if args_copy[0].is_a?(Hash)
       hash ||= {'method' => method_name}
       action = "#{klass_string} . #{hash['method']} (#{hash['id']})"
@@ -154,6 +165,7 @@ module BoyBand
       set_job_chain("none")
       BoyBand.set_job_instigator(pre_whodunnit)
       clear_job(job_hash)
+      @speed = nil
     rescue Resque::TermException
       Resque.enqueue(self, *args)
     end
@@ -176,14 +188,14 @@ module BoyBand
         idx = Resque.size(queue)
         idx.times do |i|
           item = Resque.peek(queue, i)
-          if item['args'] && item['args'][-1].match(/^chain::/)
+          if item && item['args'] && item['args'][-1].match(/^chain::/)
             chain = item['args'].pop
           end
-          if item['args'] && item['args'][-1].match(/^domain::/)
+          if item && item['args'] && item['args'][-1].match(/^domain::/)
             domain = item['args'].pop
             item['domain_id'] = domain.split(/::/, 2)[1]
           end
-          res << item
+          res << item if item
         end
       end
       res
@@ -243,7 +255,7 @@ module BoyBand
       list = []
       idx.times do |i|
         item = Resque.peek(queue, i)
-        if item['args'] && item['args'][2].is_a?(Hash) && item['args'][2]['method'] == method
+        if item && item['args'] && item['args'][2].is_a?(Hash) && item['args'][2]['method'] == method
           list << item
           puts item.to_json
         end
@@ -261,9 +273,11 @@ module BoyBand
       end
 
       idx = queue_size(queue)
+      job_hash = args_copy.to_json
+      return true if Resque.redis.get("scheduled/#{klass.to_s}/#{method_name}/#{job_hash}") == "t"
       return false if idx > 500 # big queues mustn't be searched this way
       idx = Resque.size(queue)
-      queue_class = (queue == :slow ? 'SlowWorker' : 'Worker')
+      queue_class = (queue.to_s == 'slow' ? 'SlowWorker' : 'Worker')
       if false
         job_hash = args_copy.to_json
         timestamps = JSON.parse(Resque.redis.hget('hashed_jobs', job_hash) || "[]")
@@ -402,18 +416,7 @@ module BoyBand
     end
 
     def schedule_once(method, *args)
-      return nil unless method && id
-      already_scheduled = Worker.scheduled?(self.class, :perform_action, {
-        'id' => id,
-        'method' => method,
-        'scheduled' => self.class.scheduled_stamp,
-        'arguments' => args
-      })
-      if !already_scheduled
-        schedule(method, *args)
-      else
-        false
-      end
+      schedule_once_for('default', method, *args)
     end
 
     def schedule_once_for(queue, method, *args)
@@ -464,17 +467,7 @@ module BoyBand
     end
 
     def schedule_once(method, *args)
-      return nil unless method
-      already_scheduled = Worker.scheduled?(self, :perform_action, {
-        'method' => method,
-        'scheduled' => self.scheduled_stamp,
-        'arguments' => args
-      })
-      if !already_scheduled
-        schedule(method, *args)
-      else
-        false
-      end
+      schedule_once_for('default', method, *args)
     end
 
     def schedule_once_for(queue, method, *args)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boy_band
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.14
 platform: ruby
 authors:
 - Brian Whitmer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2021-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -66,7 +66,7 @@ homepage: http://github.com/CoughDrop/boy_band
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -81,9 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: BoyBand
 test_files: []