backburner-allq 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c571fab5da811c77fe0bf58bed5f808fa8981b9730bee955cb82ae3e90695c1d
-  data.tar.gz: c365ca785e4a5d5ed0db33654d2d2d8dc9941a1b251bae20b1c445c1703dd565
+  metadata.gz: 1b73c3b5303a61511d25f26f0d29b7383a530e2f4b6de7aecbf49f7849e1aab1
+  data.tar.gz: 384a76bb81541a15068d7b216bfe1bdba72ff093af3f39119acde1485e5a3719
 SHA512:
-  metadata.gz: a66719f1557c17349478db2a21d2ee72e136582fa0329afc8c52d29187b96817a0608d0bbde79ef3f6e7feb5d0fb370bf55d470faa7be7b49e3e7f4bd5d9a77f
-  data.tar.gz: e952ae3e8eb9427055b7dfc6612a4fda9d79bdc767a2af0da2ea7559be93bf35f1972bf23d95c209a810e90fc8c95977b95d8f4213691aed27408f26409218c1
+  metadata.gz: d82bbf92e60e38b4a875c7f7d6dd322e143ee239e42122ae83f61a82c5249a9d6306e600951bf9cdd9fa9833a1489235a8b7cb878c253b8fa5bb137d8e45773d
+  data.tar.gz: 98b6537bda44810cd9b312aebe3eb47130ead4a2bc2d6f61f95a844b2742723e96e3c46b64d631515a7812d0b6741a1f0965c1ab2c0dc81f98e4badddc574434

data/deploy.sh

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

data/lib/backburner/allq_wrapper.rb

@@ -79,7 +79,7 @@ module Backburner
   end
 
   class AllQWrapper
-    def initialize(url = Blitline::Constants::ALLQ_DEFAULT_EU_URL)
+    def initialize(url = 'localhost:8090')
       allq_conf = Allq::Configuration.new do |config|
         config.host = url
       end
@@ -127,35 +127,30 @@ module Backburner
       return nil if job.body.nil?
 
       job.body = Base64.decode64(job.body) if job
-      job_obj = Blitline::AllQJob.new(self, job)
+      job_obj = Backburner::AllQJob.new(self, job)
       job_obj
     end
 
     def get(tube_name = 'default')
       job = nil
-      delt = Blitline::Utils.get_delta do
-        job = @client.job_get(tube_name)
-      end
-      puts "Allq http get delta: #{delt} #{tube_name} #{job}" if delt.to_f > 1.5
+      job = @client.job_get(tube_name)
 
-      @recent_times.push(delt.to_f)
-      @recent_times.shift if @recent_times.size > 2
       # Inplace decode
       job.body = Base64.decode64(job.body) if job&.body
 
-      job_obj = Blitline::AllQJob.new(self, job)
+      job_obj = Backburner::AllQJob.new(self, job)
       job_obj
     rescue StandardError => ex
       if ex.message == "Couldn't resolve host name"
-        BlitlineLogger.log("COUDNT RESOLVE HOST NAME------ SHOULD REBOOT")
+        puts("COUDNT RESOLVE HOST NAME------ SHOULD REBOOT")
       else
-        BlitlineLogger.log(ex)
+        puts(ex)
       end
     end
 
     def close
     rescue StandardError => ex
-      BlitlineLogger.log(ex)
+      puts(ex)
     end
 
     def map_priority(app_priority)
@@ -178,9 +173,9 @@ module Backburner
     end
 
     def log_result(job_result)
-      BlitlineLogger.log("ALLQ-HTTP-JOB-ID=#{job_result.job_id}")
+      puts("ALLQ-HTTP-JOB-ID=#{job_result.job_id}")
     rescue StandardError => ex
-      BlitlineLogger.log(ex)
+      puts(ex)
     end
 
     def build_new_job(body, options)
@@ -241,30 +236,27 @@ module Backburner
       begin
         Timeout.timeout(10) do
           if body && body.to_s.include?('["default"]')
-            BlitlineLogger.log "PUTTING DEFAULT! #{caller.inspect}"
+            puts "PUTTING DEFAULT! #{caller.inspect}"
           end
 
-          delt = Blitline::Utils.get_delta do
-            if is_parent
-              new_job = build_new_parent_job(body, options)
-              result = @client.parent_job_post(new_job)
-            else
-              new_job = build_new_job(body, options)
-              result = @client.job_post(new_job)
-            end
-            raise 'PUT returned nil' if result.nil? || result.to_s == ''
+          if is_parent
+            new_job = build_new_parent_job(body, options)
+            result = @client.parent_job_post(new_job)
+          else
+            new_job = build_new_job(body, options)
+            result = @client.job_post(new_job)
           end
-          BlitlineLogger.log "Allq http put delta: #{delt}"
+          raise 'PUT returned nil' if result.nil? || result.to_s == ''
         end
       rescue Timeout::Error
-        BlitlineLogger.log('ALLQ_PUT_TIMEOUT')
+        puts('ALLQ_PUT_TIMEOUT')
         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
-        BlitlineLogger.log('Failed to ALLQ PUT')
-        BlitlineLogger.log(ex)
+        puts('Failed to ALLQ PUT')
+        puts(ex)
         retry_count += 1
         sleep(5)
         retry if retry_count < 4
@@ -290,7 +282,7 @@ module Backburner
       end
       final_stats
     rescue StandardError => ex
-      BlitlineLogger.log(ex)
+      puts(ex)
       {}
     end
 
@@ -300,7 +292,7 @@ module Backburner
       count = tube_stats['ready'].to_i if tube_stats && tube_stats['ready']
       count
     rescue StandardError => ex
-      BlitlineLogger.log(ex)
+      puts(ex)
       -1
     end
 
@@ -308,7 +300,7 @@ module Backburner
       result = get_ready_by_tube('default')
       result.to_i
     rescue StandardError => ex
-      BlitlineLogger.log(ex)
+      puts(ex)
       0
     end
   end

data/lib/backburner/configuration.rb

@@ -21,8 +21,8 @@ module Backburner
     attr_accessor :job_parser_proc     # proc to parse a job body from a string
 
     def initialize
-      @allq_url       = "127.0.0.1:8090"
-      @tube_namespace      = ""
+      @allq_url       = "allq://127.0.0.1:8091"
+      @tube_namespace      = "backallq"
       @namespace_separator = "."
       @default_priority    = 5
       @respond_timeout     = 120

data/lib/backburner/connection.rb

@@ -1,7 +1,7 @@
 require 'delegate'
 
 module Backburner
-  class Connection < SimpleDelegator
+  class Connection
     class BadURL < RuntimeError; end
 
     attr_accessor :url, :allq_wrapper
@@ -27,7 +27,6 @@ module Backburner
     def close
       @allq_wrapper.close if @allq_wrapper
       @allq_wrapper = nil
-      __setobj__(@allq_wrapper)
     end
 
     # Determines if the connection to allq is currently open
@@ -67,7 +66,7 @@ module Backburner
       begin
         yield
 
-      rescue Beaneater::NotConnected
+      rescue Exception => e
         if retry_count > 0
           reconnect!
           retry_count -= 1
@@ -80,8 +79,6 @@ module Backburner
       end
     end
 
-    protected
-
     # Attempt to ensure we're connected to allq if the missing method is
     # present in the delegate and we haven't shut down the connection on purpose
     # @raise [Beaneater::NotConnected] If allq fails to connect after multiple attempts.
@@ -93,8 +90,7 @@ module Backburner
     # Connects to a allq queue
     # @raise Beaneater::NotConnected if the connection cannot be established
     def connect!
-      @allq_wrapper = Backburner::AllqWrapper.new(allq_addresses)
-      __setobj__(@allq_wrapper)
+      @allq_wrapper = Backburner::AllQWrapper.new(allq_addresses)
       @allq_wrapper
     end
 
@@ -102,7 +98,7 @@ module Backburner
       pri = (opt[:pri] || 5).to_i
       delay = opt[:delay].to_i
       ttr = (opt[:ttr] || 600).to_i
-      @allq_wrapper.put2(data, pri, ttr, delay)
+      @allq_wrapper.put2(data, pri, ttr, tube_name, delay)
     end
 
     def get(tube_name)

data/lib/backburner/job.rb

@@ -48,12 +48,7 @@ module Backburner
       return false unless res
       # Execute the job
       @hooks.around_hook_events(job_name, :around_perform, *args) do
-        # We subtract one to ensure we timeout before beanstalkd does, except if:
-        #  a) ttr == 0, to support never timing out
-        #  b) ttr == 1, so that we don't accidentally set it to never time out
-        #  NB: A ttr of 1 will likely result in race conditions between
-        #  Backburner and beanstalkd and should probably be avoided
-        timeout_job_after(task.ttr > 1 ? task.ttr - 1 : task.ttr) { job_class.perform(*args) }
+        job_class.perform(*args)
       end
       task.delete
       # Invoke after perform hook

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "1.0.5"
+  VERSION = "1.0.7"
 end

data/lib/backburner/worker.rb

@@ -40,7 +40,8 @@ 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(serialized_data, :pri => pri, :delay => delay, :ttr => ttr)
+          puts "Tube name #{tube_name}"
+          response = connection.put(tube_name, serialized_data, :pri => pri, :delay => delay, :ttr => ttr)
         end
         return nil unless Backburner::Hooks.invoke_hook_events(job_class, :after_enqueue, *args)
       ensure
@@ -129,7 +130,8 @@ module Backburner
     def work_one_job(conn = connection)
       begin
         job = reserve_job(conn)
-      rescue Beaneater::TimedOutError => e
+      rescue Exception => e
+        sleep(rand*3)
         return
       end
 
@@ -149,18 +151,13 @@ module Backburner
 
       # NB: There's a slight chance here that the connection to beanstalkd has
       # gone down between the time we reserved / processed the job and here.
-      num_retries = job.stats.releases
+      num_retries = job.releases
       max_job_retries = resolve_max_job_retries(job.job_class)
       retry_status = "failed: attempt #{num_retries+1} of #{max_job_retries+1}"
-      if num_retries < max_job_retries # retry again
-        retry_delay = resolve_retry_delay(job.job_class)
-        delay = resolve_retry_delay_proc(job.job_class).call(retry_delay, num_retries) rescue retry_delay
-        job.retry(num_retries + 1, delay)
-        self.log_job_end(job.name, "#{retry_status}, retrying in #{delay}s") if job_started_at
-      else # retries failed, bury
-        job.bury
-        self.log_job_end(job.name, "#{retry_status}, burying") if job_started_at
-      end
+      retry_delay = resolve_retry_delay(job.job_class)
+      delay = resolve_retry_delay_proc(job.job_class).call(retry_delay, num_retries) rescue retry_delay
+      job.release(delay)
+      self.log_job_end(job.name, "#{retry_status}, retrying in #{delay}s") if job_started_at
 
       handle_error(e, job.name, job.args, job)
     end
@@ -170,7 +167,7 @@ module Backburner
 
     # Return a new connection instance
     def new_connection
-      Connection.new(Backburner.configuration.beanstalk_url) { |conn| Backburner::Hooks.invoke_hook_events(self, :on_reconnect, conn) }
+      Connection.new(Backburner.configuration.allq_url) { |conn| Backburner::Hooks.invoke_hook_events(self, :on_reconnect, conn) }
     end
 
     # Reserve a job from the watched queues

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Jason Malcolm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-08 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: allq_rest