backburner-allq 1.0.31 → 1.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fadeda9c5cd1ea2944c017dd005fe56acf0a93c525c060ab243a4d56fd9348a
-  data.tar.gz: 69b8b032a9225fa2b8ac80e9e8379e89d169eb3f53948fba3128dfa730890323
+  metadata.gz: dcdca608a5d89c656e3bac8e9c08a8609bd621c87a65627be816182047f72682
+  data.tar.gz: 5b22e47c0e50d030e6b512b9b592b5e754281b6152f16225539074277458071b
 SHA512:
-  metadata.gz: 4001bde438023201e35cda405fc977918b1c77c33b1159e922d9d04789264323af58d2582105bca794df921a4e612d32d66885104021a2678af61592fd314390
-  data.tar.gz: 07cb5147efc0a3f720799599451de746ba3b54bf8ae32a46dc5425bb07a428a8eecfc66ae9d58593468d9e98c0fe10b729e17d87ed0a1e735f056dbe1f635bad
+  metadata.gz: ef7402c39f84323438ac0f8427943143f3f7e8ab82f56dd60669147098dc38d6fab2ab84a3a12d2fc0a751f270ac6cb3723ef800aa523b67b18f2e18290f76a5
+  data.tar.gz: b5f5ba04f1bebb6e511cb4d32c3bf83f6c2fb5e0960b908a6d1ef90cbf206e39c9a7c4d9e38745ab7734de990313e24ab1142f724f71d94ef8e69f8a95c1ce33

data/deploy.sh

@@ -1,3 +1,3 @@
 echo "Did you update the version?"
 gem build backburner-allq.gemspec
-gem push backburner-allq-1.0.31.gem
+gem push backburner-allq-1.0.35.gem

data/lib/backburner/allq_wrapper.rb

@@ -21,7 +21,7 @@ module Backburner
             ran = true
           end
           # Wait if nothing returned
-          sleep(rand() * 3) unless ran
+          sleep(rand * 3) unless ran
         end
       end
     end
@@ -81,7 +81,7 @@ module Backburner
   end
 
   class AllQWrapper
-    DEFAULT_TIMEOUT = 17800
+    DEFAULT_TIMEOUT = 17_800
     def initialize(url = 'localhost:8090')
       allq_conf = Allq::Configuration.new do |config|
         config.host = url
@@ -91,14 +91,12 @@ module Backburner
       @client = Allq::ActionsApi.new(raw_client)
       @admin = Allq::AdminApi.new(raw_client)
       @recent_times = []
-
     end
 
     def speed
-      if @recent_times.size > 0
-        return @recent_times.sum(0.0) /  @recent_times.size
-      end
-      return 0
+      return @recent_times.sum(0.0) / @recent_times.size if @recent_times.size > 0
+
+      0
     end
 
     def touch(job)
@@ -118,7 +116,7 @@ module Backburner
     end
 
     def bury(job)
-     @client.bury_put(job.id)
+      @client.bury_put(job.id)
     end
 
     def tube_names
@@ -131,13 +129,11 @@ module Backburner
     end
 
     def peek_buried(tube_name = 'default')
-      job = nil
       job = @client.peek_get(tube_name, buried: true)
       return nil if job.body.nil?
 
       job.body = Base64.decode64(job.body) if job
-      job_obj = Backburner::AllQJob.new(self, job)
-      job_obj
+      Backburner::AllQJob.new(self, job)
     end
 
     def get(tube_name = 'default')
@@ -147,19 +143,18 @@ module Backburner
       # Inplace decode
       job.body = Base64.decode64(job.body) if job&.body
 
-      job_obj = Backburner::AllQJob.new(self, job)
-      job_obj
-    rescue StandardError => ex
-      if ex.message == "Couldn't resolve host name"
-        puts("COUDNT RESOLVE HOST NAME------ SHOULD REBOOT")
+      Backburner::AllQJob.new(self, job)
+    rescue StandardError => e
+      if e.message == "Couldn't resolve host name"
+        puts('COUDNT RESOLVE HOST NAME------ SHOULD REBOOT')
       else
-        puts(ex)
+        puts(e)
       end
     end
 
     def close
-    rescue StandardError => ex
-      puts(ex)
+    rescue StandardError => e
+      puts(e)
     end
 
     def map_priority(app_priority)
@@ -168,16 +163,14 @@ module Backburner
       # IF already using allq-like priority, stick with it
       return app_priority if app_priority < 11 && app_priority > 0
 
-      default = 5
-
       # return app_priority unless larger than 10
       app_priority > 10 ? 5 : app_priority
     end
 
     def log_result(job_result)
       puts("ALLQ-HTTP-JOB-ID=#{job_result.job_id}")
-    rescue StandardError => ex
-      puts(ex)
+    rescue StandardError => e
+      puts(e)
     end
 
     def build_new_job(body, options)
@@ -188,14 +181,13 @@ module Backburner
       delay = options[:delay] || 0
       parent_id = options[:parent_id]
 
-      new_job = Allq::NewJob.new(tube: tube_name,
-                                 body: Base64.strict_encode64(body),
-                                 ttl: ttl,
-                                 delay: delay,
-                                 priority: adjusted_priority,
-                                 shard_key: options[:shard_key],
-                                 parent_id: parent_id)
-      new_job
+      Allq::NewJob.new(tube: tube_name,
+                       body: Base64.strict_encode64(body),
+                       ttl: ttl,
+                       delay: delay,
+                       priority: adjusted_priority,
+                       shard_key: options[:shard_key],
+                       parent_id: parent_id)
     end
 
     def build_new_parent_job(body, options)
@@ -208,16 +200,15 @@ module Backburner
       timeout = options[:timeout] || 3_600
       run_on_timeout = options[:run_on_timeout] || false
 
-      new_parent_job = Allq::NewParentJob.new(tube: tube_name,
-                                              body: Base64.strict_encode64(body),
-                                              ttl: ttl,
-                                              delay: delay,
-                                              priority: adjusted_priority,
-                                              timeout: timeout,
-                                              run_on_timeout: run_on_timeout,
-                                              shard_key: options[:shard_key],
-                                              limit: limit)
-      new_parent_job
+      Allq::NewParentJob.new(tube: tube_name,
+                             body: Base64.strict_encode64(body),
+                             ttl: ttl,
+                             delay: delay,
+                             priority: adjusted_priority,
+                             timeout: timeout,
+                             run_on_timeout: run_on_timeout,
+                             shard_key: options[:shard_key],
+                             limit: limit)
     end
 
     def put(body, options)
@@ -228,9 +219,6 @@ module Backburner
 
       begin
         Timeout.timeout(10) do
-          if body && body.to_s.include?('["default"]')
-          end
-
           if is_parent
             new_job = build_new_parent_job(body, options)
             result = @client.parent_job_post(new_job)
@@ -241,18 +229,18 @@ module Backburner
           raise 'PUT returned nil' if result.nil? || result.to_s == ''
         end
       rescue Timeout::Error
-        puts('ALLQ_PUT_TIMEOUT')
+        puts('ALLQ PUT timeout, retrying...')
         sleep(5)
         retry_count += 1
         retry if retry_count < 4
-        raise 'Failed to put on allq, we are investigating the problem, please try again'
-      rescue StandardError => ex
-        puts('Failed to ALLQ PUT')
-        puts(ex)
+        raise "Failed to put on allq, we are investigating the problem, please try again -> #{body}"
+      rescue StandardError => e
+        puts('Failed to ALLQ PUT, retrying...')
+        puts(e)
         retry_count += 1
         sleep(5)
         retry if retry_count < 4
-        raise 'Failed to put on allq, we are investigating the problem, please try again'
+        raise "Failed to put on allq, we are investigating the problem, please try again: #{body}"
       end
       result
     end
@@ -278,27 +266,9 @@ module Backburner
         end
       end
       final_stats
-    rescue StandardError => ex
-      puts(ex)
+    rescue StandardError => e
+      puts(e)
       {}
     end
-
-    def get_ready_by_tube(name)
-      count = -1
-      tube_stats = stats[name]
-      count = tube_stats['ready'].to_i if tube_stats && tube_stats['ready']
-      count
-    rescue StandardError => ex
-      puts(ex)
-      -1
-    end
-
-    def size
-      result = get_ready_by_tube('default')
-      result.to_i
-    rescue StandardError => ex
-      puts(ex)
-      0
-    end
   end
 end

data/lib/backburner/connection.rb

@@ -109,7 +109,10 @@ module Backburner
         ttr: ttr
       }
 
-      options.merge!(opt)
+      options[:shard_key] = opt[:shard_key] if opt[:shard_key]
+
+      # Overwrite originals
+      opt.merge!(options)
       @allq_wrapper.put(data, options)
     end
 

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "1.0.31"
+  VERSION = "1.0.35"
 end

data/lib/backburner/worker.rb

@@ -24,6 +24,7 @@ module Backburner
     #   Backburner::Worker.enqueue NewsletterSender, [self.id, user.id], :ttr => 1000
     #
     def self.enqueue(job_class, args=[], opts={})
+      opts[:shard_key] = opts[:shard_key].nil? ? "X" : opts[:shard_key].to_s
       pri   = resolve_priority(opts[:pri] || job_class)
       delay = [0, opts[:delay].to_i].max
       ttr   = resolve_respond_timeout(opts[:ttr] || job_class)
@@ -40,7 +41,13 @@ module Backburner
         connection.retryable do
           tube_name = expand_tube_name(queue || job_class)
           serialized_data = Backburner.configuration.job_serializer_proc.call(data)
-          response = connection.put(tube_name, serialized_data, :pri => pri, :delay => delay, :ttr => ttr, :shard_key => opts[:shard_key])
+          send_data = {
+            pri: pri,
+            delay: delay,
+            ttr: ttr
+          }
+          opts.merge!(send_data)
+          response = connection.put(tube_name, serialized_data, opts)
         end
         return nil unless Backburner::Hooks.invoke_hook_events(job_class, :after_enqueue, *args)
       ensure

data/lib/backburner/workers/threads_on_fork.rb

@@ -207,7 +207,7 @@ module Backburner
 
       # Run work_one_job while we can
       def run_while_can(conn = connection)
-        puts "Run while can"
+        log_info "Run while can"
         while @garbage_after.nil? or @garbage_after > @runs
           @runs += 1 # FIXME: Likely race condition
           work_one_job(conn, @watched_tube_name)
@@ -221,7 +221,7 @@ module Backburner
       end
 
       def on_reconnect(conn)
-        watch_tube(@watching_tube, conn) if @watching_tube
+        watch_tube(@watched_tube_name, conn) if @watched_tube_name
       end
 
       # Exit with Kernel.exit! to avoid at_exit callbacks that should belongs to

data/lib/backburner.rb

@@ -10,8 +10,8 @@ require 'backburner/logger'
 require 'backburner/connection'
 require 'backburner/hooks'
 require 'backburner/performable'
-require 'backburner/worker'
-require 'backburner/workers/simple'
+require_relative 'backburner/worker'
+require_relative 'backburner/workers/simple'
 require 'backburner/workers/forking'
 require 'backburner/workers/threads_on_fork'
 require 'backburner/workers/threading'
@@ -24,10 +24,12 @@ module Backburner
     # @example
     #   Backburner.enqueue NewsletterSender, self.id, user.id
     #
-    def enqueue(job_class, args, shard_key: nil)
-      Backburner::Worker.enqueue(job_class, args, { shard_key: shard_key.nil? ? "X" : shard_key.to_s })
+    def enqueue(job_class, args, opts={})
+      opts[:shard_key] = opts[:shard_key].nil? ? "X" : opts[:shard_key].to_s
+      Backburner::Worker.enqueue(job_class, args, opts)
     end
 
+
     # Begins working on jobs enqueued with optional tubes specified
     #
     # @example

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.31
+  version: 1.0.35
 platform: ruby
 authors:
 - Jason Malcolm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-24 00:00:00.000000000 Z
+date: 2021-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: allq_rest
@@ -188,8 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.9
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Reliable allq background job processing made easy for Ruby and Sinatra