boy_band 0.1.8 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a930be01f9c60ee6dfd4b6a31878fd1c2cba89a431396fe9f8f70d7da777b348
-  data.tar.gz: 58d42b0090f9fb2b8c907d0dfbdf37f832ecb398033d6d4c491215265dd5b172
+  metadata.gz: 4cd78f34f6e59840ca1c26e224ae07c6c00474d359b251cc510bbe73206b7091
+  data.tar.gz: d1fd4e70195819e3a7e176323e9c0a73027c18aeee6fa643e8d1bbf01669d649
 SHA512:
-  metadata.gz: 9240d0607c514e5da5fc699b2e12ad9fc59abf7b41b3b2ea6a29fdd21426dc2f50bdf078a093c0b7fd6392ba26f0b86573a98ff78d6d7081512d455c64c4213c
-  data.tar.gz: 60b7a0dcdbc2eb3a61ceed0724d4e2db28224f2143f941aeabd5538a3c73c2ffec2c9c1b8604e03ff4b6ea83a71f32b8aec4adfff38d0f7cce688576154ed42b
+  metadata.gz: 6caebc3b98d4caa82b28f16a9491b35ebf82afcf0e5bbd5fbeba65389ecb6cbb103188073f4a3b55acbb8862d05fd6388a9aae9afcbd1fb871518b03ab68f266
+  data.tar.gz: d145d07df99f98d0827e4126d349bbf26c33a877452fbb729948c0f70992c4ee9c73aa942ff6c3ee33b3587070290060f403baa04cbf54fc2face5a2aaaef96b

data/lib/boy_band.rb

@@ -39,12 +39,22 @@ module BoyBand
     def set_job_chain(val)
       @@job_chain = val
     end
+
+    def queue_size(queue)
+      size = Resque.redis.get("sizeof/#{queue}").to_i
+      if !size || size == 0
+        size = Resque.size(queue)
+        Resque.redis.setex("sizeof/#{queue}", 30.seconds.to_i, size)
+      end
+      size
+    end
   
     def schedule_for(queue, klass, method_name, *args)
+      queue = queue.to_sym
       @queue = queue.to_s
       job_hash = Digest::MD5.hexdigest(args.to_json)
       note_job(job_hash)
-      size = Resque.size(queue)
+      size = queue_size(queue)
       args.push("domain::#{self.domain_id}")
       chain = self.job_chain.split(/##/)
       job_id = "j#{Time.now.iso8601}_#{rand(9999)}"
@@ -53,14 +63,19 @@ 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('##')}")
       if queue == :slow
@@ -79,21 +94,21 @@ module BoyBand
     end
   
     def note_job(hash)
-      if Resque.redis
-        timestamps = JSON.parse(Resque.redis.hget('hashed_jobs', hash) || "[]")
-        cutoff = 6.hours.ago.to_i
-        timestamps = timestamps.select{|ts| ts > cutoff }
-        timestamps.push(Time.now.to_i)
-  #      Resque.redis.hset('hashed_jobs', hash, timestamps.to_json)
-      end
+  #     if Resque.redis
+  #       timestamps = JSON.parse(Resque.redis.hget('hashed_jobs', hash) || "[]")
+  #       cutoff = 6.hours.ago.to_i
+  #       timestamps = timestamps.select{|ts| ts > cutoff }
+  #       timestamps.push(Time.now.to_i)
+  # #      Resque.redis.hset('hashed_jobs', hash, timestamps.to_json)
+  #     end
     end
   
     def clear_job(hash)
-      if Resque.redis
-        timestamps = JSON.parse(Resque.redis.hget('hashed_jobs', hash) || "[]")
-        timestamps.shift
-  #      Resque.redis.hset('hashed_jobs', hash, timestamps.to_json)
-      end
+  #     if Resque.redis
+  #       timestamps = JSON.parse(Resque.redis.hget('hashed_jobs', hash) || "[]")
+  #       timestamps.shift
+  # #      Resque.redis.hset('hashed_jobs', hash, timestamps.to_json)
+  #     end
     end
   
     def schedule(klass, method_name, *args)
@@ -111,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])
@@ -124,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']})"
@@ -144,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
@@ -166,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
@@ -233,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
@@ -250,8 +272,12 @@ module BoyBand
         set_domain_id(args_copy.pop.split(/::/, 2)[1])
       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) || "[]")
@@ -390,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)
@@ -438,7 +453,7 @@ module BoyBand
         'scheduled' => self.scheduled_stamp,
         'arguments' => args
       }
-      Worker.schedule(self, :perform_action, settings)
+      schedule_for('default', method, *args)
     end
   
     def schedule_for(queue, method, *args)
@@ -452,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.8
+  version: 0.1.13
 platform: ruby
 authors:
 - Brian Whitmer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-02-19 00:00:00.000000000 Z
+date: 2020-12-08 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: []