backburner-allq 1.0.27 → 1.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69721aa42e6a982be1a83b0bde06791fc56f2e63973becc256694eda7c95ecf9
-  data.tar.gz: db74b8f5dafe0bc388d85c71f2d1be63e67f5bd66c6e278f18ed316303ea3a77
+  metadata.gz: 6207b9cc69fea65114989c7ec8d69aceb41fc1f9a68808dfc04c3ecc63600f33
+  data.tar.gz: 3fcf11b39e0b37159ec932ca453d75b16cec3236ea5bd8b5388e2fc9b5d6ab33
 SHA512:
-  metadata.gz: 56cfbaae154eca6249eb139012a2bc47c37a6a3cfa3063a039c5e18eb7044caed5222bd84931d3d47a2f20fe42e3e62a66cc5b9b7d0fff9211fc172909683cf5
-  data.tar.gz: 3171dd89c01fb425d8cf6fc25a4fd26762c458c5980e6bba55b33411fe404e0c62890501d493269a7ec1ba8f74b88b0432e007ccbf4491580c1781b75f69a66f
+  metadata.gz: 195fb3af0b6e411df1a38c580d5b11e871a0552cb301e8cda1b5ef6ec2148cceac1518dd2ddd727692d1b04440a13a374e4ca0e1bacf386756a0ca0598ea8184
+  data.tar.gz: 1b7761257c2af95899cd6a2a29d53129d5a34d2f52ed97bddf00b936a2064f6f996a194c54c6edabb4ea2826d141260154a501e7a671a2fc445baede9ce1029f

data/deploy.sh

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

data/lib/backburner.rb

@@ -18,23 +18,18 @@ require 'backburner/workers/threading'
 require 'backburner/queue'
 
 module Backburner
-  class Allq
-    # Convenience method to logically separate old Backburner from new Allq Backburner
-    def self.enqueue(job_class, args, shard_key: nil)
-      Backburner.enqueue(job_class, args, shard_key)
-    end
-  end
-
   class << self
     # Enqueues a job to be performed with given arguments.
     #
     # @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] ? "X" : opts[:shard_key].to_s
+      Backburner::Worker.enqueue(job_class, args, opts)
     end
 
+
     # Begins working on jobs enqueued with optional tubes specified
     #
     # @example

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)
@@ -246,9 +237,9 @@ module Backburner
         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
+      rescue StandardError => e
         puts('Failed to ALLQ PUT')
-        puts(ex)
+        puts(e)
         retry_count += 1
         sleep(5)
         retry if retry_count < 4
@@ -278,27 +269,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,8 @@ module Backburner
         ttr: ttr
       }
 
-      options.merge!(opt)
+      # 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.27"
+  VERSION = "1.0.32"
 end

data/lib/backburner/worker.rb

@@ -40,7 +40,14 @@ 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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.27
+  version: 1.0.32
 platform: ruby
 authors:
 - Jason Malcolm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-20 00:00:00.000000000 Z
+date: 2021-08-11 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