backburner 0.4.2 → 0.4.3

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## Version 0.4.3 (July 19 2013)
+
+ * FIX #44 Additional fix to issue introduced in 0.4.2
+ * FIX #45 More graceful shutdown using Kernel.exit and rescuing SystemExit. (Thanks @ryanjohns)
+
 ## Version 0.4.2 (July 3 2013)
 
  * FIX #44 Properly retry to connect to beanstalkd when connection fails.

data/lib/backburner/version.rb

@@ -1,3 +1,3 @@
 module Backburner
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/lib/backburner/worker.rb

@@ -27,15 +27,15 @@ module Backburner
       pri   = resolve_priority(opts[:pri] || job_class)
       delay = [0, opts[:delay].to_i].max
       ttr   = opts[:ttr] || Backburner.configuration.respond_timeout
-      tube  = connection.tubes[expand_tube_name(opts[:queue]  || job_class)]
       res = Backburner::Hooks.invoke_hook_events(job_class, :before_enqueue, *args)
       return false unless res # stop if hook is false
       data = { :class => job_class.name, :args => args }
-      tube.put data.to_json, :pri => pri, :delay => delay, :ttr => ttr
+      retryable_command do
+        tube  = connection.tubes[expand_tube_name(opts[:queue]  || job_class)]
+        tube.put(data.to_json, :pri => pri, :delay => delay, :ttr => ttr)
+      end
       Backburner::Hooks.invoke_hook_events(job_class, :after_enqueue, *args)
       return true
-    rescue Beaneater::NotConnected => e
-      retry_connection!
     end
 
     # Starts processing jobs with the specified tube_names.
@@ -44,7 +44,11 @@ module Backburner
     #   Backburner::Worker.start(["foo.tube.name"])
     #
     def self.start(tube_names=nil)
-      self.new(tube_names).start
+      begin
+        self.new(tube_names).start
+      rescue SystemExit
+        # do nothing
+      end
     end
 
     # Returns the worker connection.
@@ -54,23 +58,21 @@ module Backburner
       @connection ||= Connection.new(Backburner.configuration.beanstalk_url)
     end
 
-    # Retries to make a connection to beanstalkd if that connection failed.
+    # Retries the given command specified in the block several times if there is a connection error
+    # Used to execute beanstalkd commands in a retryable way
+    #
+    # @example
+    #   retryable_command { ... }
     # @raise [Beaneater::NotConnected] If beanstalk fails to connect multiple times.
-    def self.retry_connection!(max_tries=5)
-      retry_count = 0
+    #
+    def self.retryable_command(max_tries=8, &block)
       begin
-        @connection = nil
-        self.connection
+        yield
       rescue Beaneater::NotConnected => e
-        if retry_count < max_tries
-          retry_count += 1
-          sleep 0.5
-          retry
-        else # stop retrying
-          raise e
-        end
+        retry_connection!(max_tries)
+        yield
       end
-    end # retry_connection!
+    end
 
     # List of tube names to be watched and processed
     attr_accessor :tube_names
@@ -111,7 +113,7 @@ module Backburner
     # Triggers this worker to shutdown
     def shutdown
       log_info 'Worker exiting...'
-      Kernel.exit!
+      Kernel.exit
     end
 
     # Processes tube_names given tube_names array.
@@ -156,6 +158,41 @@ module Backburner
       handle_error(e, job.name, job.args)
     end
 
+    # Retries the given command specified in the block several times if there is a connection error
+    # Used to execute beanstalkd commands in a retryable way
+    #
+    # @example
+    #   retryable_command { ... }
+    # @raise [Beaneater::NotConnected] If beanstalk fails to connect multiple times.
+    #
+    def self.retryable_command(max_tries=8, &block)
+      begin
+        yield
+      rescue Beaneater::NotConnected => e
+        retry_connection!(max_tries)
+        yield
+      end
+    end
+
+    # Retries to make a connection to beanstalkd if that connection failed.
+    # @raise [Beaneater::NotConnected] If beanstalk fails to connect multiple times.
+    #
+    def self.retry_connection!(max_tries=8)
+      retry_count = 0
+      begin
+        @connection = nil
+        self.connection.stats
+      rescue Beaneater::NotConnected => e
+        if retry_count < max_tries
+          retry_count += 1
+          sleep 1
+          retry
+        else # stop retrying
+          raise e
+        end
+      end
+    end # retry_connection!
+
     protected
 
     # Returns a list of all tubes known within the system

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: backburner
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaneater
@@ -169,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4352332376795710100
+      hash: -2883142524196216213
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4352332376795710100
+      hash: -2883142524196216213
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25