openstax_rescue_from 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 852b1a3ad1e57449234029b6854de07b895f2938
-  data.tar.gz: 5ba86b4744e24377f1fd7bae8d8f4b4835124917
+  metadata.gz: f56fb3c7bf8ded13176b734d53f1fe4c8342abf0
+  data.tar.gz: 67d6bad535a4d2dec26bbacc82f1fe7e9c2b6c55
 SHA512:
-  metadata.gz: b4e4171380854d6ecc65985e1853cc2b495ac97dee96008c4b00b443f362a4ced5f97f1f55d949b3c64f00c39925a00db1ba2c3f640b52bc1f6094fbc47b0436
-  data.tar.gz: d7df25cb30b713ff98564d84c18b3088a0aacc19f9fa4c3c897ffda24b2b863ef6b8e72829e1b910cf06d7267807b59e45d6057ad3c29b5c7473918369d53f37
+  metadata.gz: 9bb963a69ecd726c5971ff26c665b172e2aa859abb1d3790111036d96c70b9ac62730dc09881e5c1001c3ae8bfab80ffffc8daaa7cfc96b7fef51d4b8c364823
+  data.tar.gz: a805ae5d1c5e446fbf3aa519b27127e2b3a9f94a14d2fca32d0ad0ff1ec1cee7ed588aa37c5ecd186a91fba63e3a2e0b04092ee986be178eb2fcfb5f94f0331d

data/lib/generators/openstax/rescue_from/install/templates/rescue_from.rb

@@ -3,6 +3,9 @@ require 'openstax_rescue_from'
 OpenStax::RescueFrom.configure do |config|
   config.raise_exceptions = ![false, 'false'].include?(ENV['RAISE_EXCEPTIONS']) ||
                               Rails.application.config.consider_all_requests_local
+  config.raise_background_exceptions = ![false, 'false'].include?(
+    ENV['RAISE_BACKGROUND_EXCEPTIONS']
+  )
 
   # config.app_name = ENV['APP_NAME']
   # config.app_env = ENV['APP_ENV']

data/lib/openstax/rescue_from.rb

@@ -15,21 +15,25 @@ module OpenStax
         finish_exception_rescue(proxy, listener)
       end
 
-      def perform_background_rescue(exception)
+      def perform_background_rescue(exception, listener = MuteListener.new)
         proxy = ExceptionProxy.new(exception)
         register_unrecognized_exception(proxy.name)
         log_background_system_error(proxy)
         send_notifying_background_exceptions(proxy)
-        finish_background_exception_rescue(proxy)
+        finish_background_exception_rescue(proxy, listener)
       end
 
+      # Not threadsafe
       def do_not_reraise
         original = configuration.raise_exceptions
+        original_background = configuration.raise_background_exceptions
         begin
           configuration.raise_exceptions = false
+          configuration.raise_background_exceptions = false
           yield
         ensure
           configuration.raise_exceptions = original
+          configuration.raise_background_exceptions = original_background
         end
       end
 
@@ -46,12 +50,12 @@ module OpenStax
         end
       end
 
-      # For rescuing from specific blocks of code: OpenStax::RescueFrom.this{...}
-      def this
+      # For rescuing from specific blocks of code: OpenStax::RescueFrom.this {...}
+      def this(background = true)
         begin
           yield
-        rescue Exception => e
-          perform_rescue(e)
+        rescue Exception => ex
+          background ? perform_background_rescue(ex) : perform_rescue(ex)
         end
       end
 
@@ -190,8 +194,12 @@ module OpenStax
         end
       end
 
-      def finish_background_exception_rescue(proxy)
-        raise proxy.exception
+      def finish_background_exception_rescue(proxy, listener)
+        if configuration.raise_background_exceptions
+          raise proxy.exception
+        else
+          listener.openstax_exception_rescued(proxy, notifies_for?(proxy.name))
+        end
       end
     end
   end

data/lib/openstax/rescue_from/configuration.rb

@@ -4,9 +4,9 @@ module OpenStax
   module RescueFrom
     class Configuration
 
-      attr_accessor :raise_exceptions, :notifier, :html_error_template_path,
-        :html_error_template_layout_name, :app_name, :app_env,
-        :email_prefix, :sender_address, :exception_recipients
+      attr_accessor :raise_exceptions, :raise_background_exceptions, :notifier,
+        :html_error_template_path, :html_error_template_layout_name, :app_name,
+        :app_env, :email_prefix, :sender_address, :exception_recipients
 
       attr_writer :contact_name
 
@@ -16,6 +16,9 @@ module OpenStax
 
       def initialize
         @raise_exceptions = ![false, 'false'].include?(ENV['RAISE_EXCEPTIONS'])
+        @raise_background_exceptions = ![false, 'false'].include?(
+          ENV['RAISE_BACKGROUND_EXCEPTIONS']
+        )
 
         @app_name = ENV['APP_NAME']
         @app_env = ENV['APP_ENV']

data/lib/openstax/rescue_from/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module RescueFrom
-    VERSION = "2.0.1"
+    VERSION = "2.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_rescue_from
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - JP Slavinsky
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails