boy_band 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bb0ed487c254092a58036d84d154080993a6d82a8fc21db12e69781643fc614
-  data.tar.gz: a2f5dd392d8d591205cdf2b0d75b0682ef82f5f1ac7fa759f44533a057b2d847
+  metadata.gz: 6931c59174a8d6eda05b764b143c11c38532c46ae0d68f41b35700539db6e45a
+  data.tar.gz: 7df882de888ee4ac4680d37006f437d5b26e9055f193f596486f6259bb75997e
 SHA512:
-  metadata.gz: 21f05cb1669ac54fdc77668a0b80708092e997a832abc504872c2be5aee145b66e3bd3ff4a79b80dafb6ede62a6838d0785de9665db9e8de00f51acaf5f55fa6
-  data.tar.gz: 06c726f35e6c6dafe8ee6baa8ac6ec7acc37b12980b85b5f9712ec132af92912079625050cb0b9d739b3c5cc13428e2ff55dc28c3ac62519bf310cdd685a1892
+  metadata.gz: 2c19f3dd8e840f87b903d97450adbbfe0ce92b236cbbdec0905b7e6f18c283dcf2dccc2372f731cfbcc53bde6e530e79061b6da072b1cf49f61fe1ab461daeb4
+  data.tar.gz: 41cbb91e46bc9dcb8169c95c5b0b458626692679fa21668a09281d2f4a40568c7595917f8ac35268612c674470ea09bda8c557c85ba931a475bfd068dd22167a

data/lib/boy_band.rb

@@ -63,7 +63,12 @@ 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('+')}")
+      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")
@@ -134,6 +139,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']})"
@@ -261,6 +267,8 @@ 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')
@@ -402,18 +410,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 +461,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.11
 platform: ruby
 authors:
 - Brian Whitmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails