resque_mailer 2.2.0 → 2.2.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 2.2.1 / 2012-12-09
+* Added optional support for synchronous fallback (Lee Edwards and
+  Peter Jaros)
+* Added optional custom error_handler lambda support (Adam Bird)
+
 ### 2.2.0 / 2012-12-01
 * Added logging for failed deliveries (Mike Swieton)
 * Fixed / preserved exceptions for template renders (Sidharth Shanker)

data/README.md

@@ -45,6 +45,15 @@ name when starting your workers.
 
     QUEUE=application_specific_mailer rake environment resque:work
 
+Custom handling of errors that arise when sending a message is possible by 
+assigning a lambda to the `error_hander` attribute.
+
+```ruby
+Resque::Mailer.error_handler = lambda { |mailer, message, error|
+  # some custom error handling code here in which you optionally re-raise the error
+}
+```
+
 ### Using with Resque Scheduler
 
 If [resque-scheduler](https://github.com/bvandenbos/resque-scheduler) is

data/lib/resque_mailer.rb

@@ -3,7 +3,7 @@ require 'resque_mailer/version'
 module Resque
   module Mailer
     class << self
-      attr_accessor :default_queue_name, :default_queue_target, :current_env, :logger
+      attr_accessor :default_queue_name, :default_queue_target, :current_env, :logger, :fallback_to_synchronous, :error_handler
       attr_reader :excluded_environments
 
       def excluded_environments=(envs)
@@ -21,6 +21,7 @@ module Resque
     self.excluded_environments = [:test]
 
     module ClassMethods
+
       def current_env
         if defined?(Rails)
           ::Resque::Mailer.current_env || ::Rails.env
@@ -39,14 +40,19 @@ module Resque
 
       def perform(action, *args)
         begin
-          self.send(:new, action, *args).message.deliver
+          message = self.send(:new, action, *args).message
+          message.deliver
         rescue Exception => ex
-          if logger
-            logger.error "Unable to deliver email [#{action}]: #{ex}"
-            logger.error ex.backtrace.join("\n\t")
+          if Mailer.error_handler
+            Mailer.error_handler.call(self, message, ex)
+          else
+            if logger
+              logger.error "Unable to deliver email [#{action}]: #{ex}"
+              logger.error ex.backtrace.join("\n\t")
+            end
+            
+            raise ex
           end
-          
-          raise ex
         end
       end
 
@@ -104,7 +110,11 @@ module Resque
         return deliver! if environment_excluded?
 
         if @mailer_class.deliver?
-          resque.enqueue(@mailer_class, @method_name, *@args)
+          begin
+            resque.enqueue(@mailer_class, @method_name, *@args)
+          rescue Errno::ECONNREFUSED
+            deliver!
+          end
         end
       end
 

data/lib/resque_mailer/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Mailer
-    VERSION = "2.2.0"
+    VERSION = "2.2.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque_mailer
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-01 00:00:00.000000000 Z
+date: 2012-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -88,7 +88,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1935343156117809086
+      hash: 1530888517799059977
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -97,7 +97,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1935343156117809086
+      hash: 1530888517799059977
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24