backburner-allq 1.0.14 → 1.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27888373123e4db33adc4349646b3313ff962e98a18a3ff26918e7efd701fa92
-  data.tar.gz: b71459c2a3d38a986c86b7a51a238ada776f451ceb9a242dc74b58a9ca873149
+  metadata.gz: ed4aae689c12e639f2f51a32aef5a59c80f0ab452f89fe2f29afb566474ba201
+  data.tar.gz: 62e79b474949889a1b992b7fa25a034a1c87a62d1d6db0ba5f8a01582e464071
 SHA512:
-  metadata.gz: 064e65cfb8c739d502b833007fb6b1c9d2c6ffd433c20b8f5501200c44047d596fbbf7eb0a0b55def1503193d0bedb4793c003d814b2986b164562d20f1f7ad0
-  data.tar.gz: a6d06ecca8a34f24e1ab7b667a3334220dbfbb65e7e0da4b4884e8b40e491261316484133ec1ee14b144607c3e8adbc42f2fdbe9e3fc3fba880c63e50ae13cdf
+  metadata.gz: 8f5e2bd1006d8d39e95f25b85b195ad7b8cefd5b77a16dd93ab095ef0ca080d90e04b63490e66d9247b47e9f97d2355e5b2fa9fe03b2c85dd413efa54d642a32
+  data.tar.gz: 26a7b05894906fc6d79f0e98b6bed0f67d5ea8c62b09c3b6b89acb89fb13811dc568353ce7432d89081ed79ff97f4f2da5c91ee5e20ba2131cddf10a875da7c0

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in backburner.gemspec
-gemspec
+gemspec

data/deploy.sh

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

data/lib/backburner/allq_wrapper.rb

@@ -13,14 +13,16 @@ module Backburner
 
     def watch
       Thread.new do
-        ran = false
-        job = @allq_wrapper.get(@tube_name)
-        if job.body
-          perform(job)
-          ran = true
+        loop do
+          ran = false
+          job = @allq_wrapper.get(@tube_name)
+          if job.body
+            perform(job)
+            ran = true
+          end
+          # Wait if nothing returned
+          sleep(rand() * 3) unless ran
         end
-        # Wait if nothing returned
-        sleep(rand() * 3) unless ran
       end
     end
   end

data/lib/backburner/configuration.rb

@@ -22,12 +22,12 @@ module Backburner
 
     def initialize
       @allq_url       = "allq://127.0.0.1:8091"
-      @tube_namespace      = "backallq"
+      @tube_namespace      = "backburner"
       @namespace_separator = "."
       @default_priority    = 5
       @respond_timeout     = 120
       @on_error            = nil
-      @max_job_retries     = 0
+      @max_job_retries     = 1
       @retry_delay         = 5
       @retry_delay_proc    = lambda { |min_retry_delay, num_retries| min_retry_delay + (num_retries ** 3) }
       @default_queues      = []

data/lib/backburner/connection.rb

@@ -38,6 +38,10 @@ module Backburner
       end
     end
 
+    def tubes
+      @allq_wrapper.tube_names if @allq_wrapper
+    end
+
     # Attempt to reconnect to allq. Note: the connection will not be watching
     # or using the tubes it was before it was reconnected (as it's actually a
     # completely new connection)

data/lib/backburner/job.rb

@@ -26,8 +26,8 @@ module Backburner
       @name = body["class"] || body[:class]
       @args = body["args"] || body[:args]
     rescue => ex # Job was not valid format
-      self.bury
-      raise JobFormatInvalid, "Job body could not be parsed: #{ex.inspect}"
+#      self.bury
+#      raise JobFormatInvalid, "Job body could not be parsed: #{ex.inspect}"
     end
 
     # Sets the delegator object to the underlying beaneater job
@@ -60,12 +60,12 @@ module Backburner
 
     def bury
       @hooks.invoke_hook_events(job_name, :on_bury, *args)
-      task.bury
+      @task.bury
     end
 
     def retry(count, delay)
       @hooks.invoke_hook_events(job_name, :on_retry, count, delay, *args)
-      task.release(delay: delay)
+      @task.release(delay: delay)
     end
 
     # Returns the class for the job handler

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "1.0.14"
+  VERSION = "1.0.20"
 end

data/lib/backburner/worker.rb

@@ -126,43 +126,57 @@ module Backburner
     # @example
     #   @worker.work_one_job
     # @raise [Beaneater::NotConnected] If beanstalk fails to connect multiple times.
-    def work_one_job(conn = connection)
+    def work_one_job(conn = connection, tube_name = nil)
+      if tube_name.nil?
+        self.log_error "Sampling tube, this is bad practice for Allq"
+        tube_name = @tube_names.sample 
+      end
+      
       begin
-        job = reserve_job(conn)
+        job = reserve_job(conn, tube_name)
       rescue Exception => e
+        self.log_error "Sleeping"
+        self.log_error "Exception: #{e.full_message}"
         sleep(rand*3)
         return
       end
 
-      self.log_job_begin(job.name, job.args)
-      job.process
-      self.log_job_end(job.name)
-
-    rescue Backburner::Job::JobFormatInvalid => e
-      self.log_error self.exception_message(e)
-    rescue => e # Error occurred processing job
-      self.log_error self.exception_message(e) unless e.is_a?(Backburner::Job::RetryJob)
-
-      unless job
-        self.log_error "Error occurred before we were able to assign a job. Giving up without retrying!"
-        return
-      end
-
-      # NB: There's a slight chance here that the connection to allq has
-      # gone down between the time we reserved / processed the job and here.
-      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}"
-      retry_delay = resolve_retry_delay(job.job_class)
-      delay = resolve_retry_delay_proc(job.job_class).call(retry_delay, num_retries) rescue retry_delay
-      if num_retries + 1 > max_job_retries
-        job.bury
+      if job && job.body
+        begin
+          self.log_job_begin(job.name, job.args)
+          job.process
+          self.log_job_end(job.name)
+        rescue Backburner::Job::JobFormatInvalid => e
+          self.log_error self.exception_message(e)
+        rescue => e # Error occurred processing job
+          self.log_error self.exception_message(e) unless e.is_a?(Backburner::Job::RetryJob)
+
+          unless job
+            self.log_error "Error occurred before we were able to assign a job. Giving up without retrying!"
+            return
+          end
+
+          # NB: There's a slight chance here that the connection to allq has
+          # gone down between the time we reserved / processed the job and here.
+          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}"
+          retry_delay = resolve_retry_delay(job.job_class)
+          delay = resolve_retry_delay_proc(job.job_class).call(retry_delay, num_retries) rescue retry_delay
+          
+          if num_retries + 1 > max_job_retries
+            job.bury
+          else
+            job.release(delay)
+          end
+          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
       else
-        job.release(delay)
+        sleep(rand*3)
       end
-      self.log_job_end(job.name, "#{retry_status}, retrying in #{delay}s") if job_started_at
-
-      handle_error(e, job.name, job.args, job)
+      job
     end
 
 
@@ -174,8 +188,10 @@ module Backburner
     end
 
     # Reserve a job from the watched queues
-    def reserve_job(conn, reserve_timeout = Backburner.configuration.reserve_timeout)
-      Backburner::Job.new(conn.get(@tube_names.sample))
+    def reserve_job(conn, tube_name, reserve_timeout = Backburner.configuration.reserve_timeout)
+      job = conn.get(tube_name)
+      return nil if job.nil? || job.body == nil?
+      Backburner::Job.new(job)
     end
 
     # Returns a list of all tubes known within the system

data/lib/backburner/workers/forking.rb

@@ -11,7 +11,7 @@ module Backburner
       def prepare
         self.tube_names.map! { |name| expand_tube_name(name)  }.uniq!
         log_info "Working #{tube_names.size} queues: [ #{tube_names.join(', ')} ]"
-        self.connection.tubes.watch!(*self.tube_names)
+#        self.connection.tubes.watch!(*self.tube_names)
       end
 
       # Starts processing new jobs indefinitely.

data/lib/backburner/workers/simple.rb

@@ -11,7 +11,7 @@ module Backburner
       def prepare
         self.tube_names.map! { |name| expand_tube_name(name)  }.uniq!
         log_info "Working #{tube_names.size} queues: [ #{tube_names.join(', ')} ]"
-        self.connection.tubes.watch!(*self.tube_names)
+#        self.connection.tubes.watch!(*self.tube_names)
       end
 
       # Starts processing new jobs indefinitely.

data/lib/backburner/workers/threading.rb

@@ -49,8 +49,8 @@ module Backburner
         @thread_pools.each do |tube_name, pool|
           pool.max_length.times do
             # Create a new connection and set it up to listen on this tube name
-            connection = new_connection.tap{ |conn| conn.tubes.watch!(tube_name) }
-            connection.on_reconnect = lambda { |conn| conn.tubes.watch!(tube_name) }
+            # connection = new_connection.tap{ |conn| conn.tubes.watch!(tube_name) }
+            # connection.on_reconnect = lambda { |conn| conn.tubes.watch!(tube_name) }
 
             # Make it work jobs using its own connection per thread
             pool.post(connection) do |memo_connection|
@@ -58,7 +58,7 @@ module Backburner
               loop do
                 begin
                   break if @in_shutdown
-                  work_one_job(memo_connection)
+                  work_one_job(memo_connection, tube_name)
                 rescue => e
                   log_error("Exception caught in thread pool loop. Continuing. -> #{e.message}\nBacktrace: #{e.backtrace}")
                 end

data/lib/backburner/workers/threads_on_fork.rb

@@ -181,6 +181,8 @@ module Backburner
 
         @runs = 0
 
+        puts "Threads number = #{@threads_number}"
+
         if @threads_number == 1
           watch_tube(name)
           run_while_can
@@ -205,14 +207,21 @@ module Backburner
 
       # Run work_one_job while we can
       def run_while_can(conn = connection)
+        puts "Run while can"
         while @garbage_after.nil? or @garbage_after > @runs
           @runs += 1 # FIXME: Likely race condition
-          work_one_job(conn)
+          ran_job = work_one_job(conn, @watched_tube_name)
+          # Wait a second if we didn't find a job
+          unless ran_job
+            puts "sleeping"
+            sleep(rand() * 3)
+          end
         end
       end
 
       # Shortcut for watching a tube on our beanstalk connection
       def watch_tube(name, conn = connection)
+        @watched_tube_name = name
         # No op for allq
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: backburner-allq
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.20
 platform: ruby
 authors:
 - Jason Malcolm
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: allq_rest