circuit_switch 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1e87399b178858a0b41fce787342117deab9d4a1a29c7d9262d742be2633641
-  data.tar.gz: fdf0d9ec8723b02fea239de819f60e98b24de9904d034a40f549bcf90d895f26
+  metadata.gz: 4359ba3c58190ee7f16780a8475a9fe81051823faeaddf5b220d342ab9e9c294
+  data.tar.gz: ad985994dc31cb34e4090b9b45ebad4067e30b1b91d0419389867091d596ca37
 SHA512:
-  metadata.gz: 075c7f6dfeef30c3e0faecadf30969dfa6cd1f8fd2b5e4e6f5934f0e15913ec98f4f6b8a3cf9c414a17e7b920d17ee22a01abcea18c9cf8af4bfc510562c8aba
-  data.tar.gz: 6df8910491782a75b873952c26e0ac5ebdb27aadcf93727fc044e1b5dd0eeb6bfcfceac04c30417b8f86b6ac1d0e6515b342dd8d0616fc0dc9f78f680816a232
+  metadata.gz: 2517c69a923bb7739e6a5c0409b949b41ec624e5915c9fef7fae7e9e16be267983357f4e6c106702382c4157e81e9dae443159de70723bb66fe62247928096ad
+  data.tar.gz: 815d01eb8cc81480558f3eca996158f0174b59bab6a97985399ef0184b3890dd39d283df213ca014f2855939a2253e55918ad9790b51ed7ffcb14ce2891c290d

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.4.1
+
+* Fix bug `if` `stop_report_if_reach_limit` options don't receive `false`.
+* Fix to report error with stacktrace.
+* Fix not to update run count when run isn't executable.
+
 ## 0.4.0
 
 ### Breaking Changes

data/README.md

@@ -121,7 +121,7 @@ Same as `run`, a set of options can be set. By default, this method does not sen
 - `limit_count`: [Integer] Mutates `circuit_switches.report_limit_count` whose value defined in schema is 10 by default. (default: nil)  
   Can't be set to 0 when `stop_report_if_reach_limit` is true.
 
-To know about report is executed or not, you can get through `report?`.  
+To know if `report` has already been executed or not, you can get through `reported?`.  
 Of course you can chain `report` and `run` or `open?`.
 
 #### `with_backtrace`

data/lib/circuit_switch/builder.rb

@@ -46,7 +46,7 @@ module CircuitSwitch
         close_if_reach_limit: close_if_reach_limit,
         limit_count: limit_count,
         initially_closed: initially_closed,
-      }.select { |_, v| v }
+      }.reject { |_, v| v.nil? }
       assign_runner(**arguments)
       execute_run(&block)
     end
@@ -58,7 +58,7 @@ module CircuitSwitch
         stop_report_if: stop_report_if,
         stop_report_if_reach_limit: stop_report_if_reach_limit,
         limit_count: limit_count
-      }.select { |_, v| v }
+      }.reject { |_, v| v.nil? }
       assign_reporter(**arguments)
       execute_report
     end

data/lib/circuit_switch/core.rb

@@ -9,6 +9,7 @@ module CircuitSwitch
       :report_if, :stop_report_if, :stop_report_if_reach_limit, :report_limit_count
 
     def execute_run(&block)
+      run_executable = false
       if close_if_reach_limit && run_limit_count == 0
         raise CircuitSwitchError.new('Can\'t set limit_count to 0 when close_if_reach_limit is true')
       end
@@ -21,19 +22,22 @@ module CircuitSwitch
       return self if close_if_reach_limit && switch.reached_run_limit?(run_limit_count)
       return self if switch.run_is_terminated?
 
+      run_executable = true
       unless switch.new_record? && initially_closed
         yield
         @run = true
       end
       self
     ensure
-      RunCountUpdater.perform_later(
-        key: key,
-        limit_count: run_limit_count,
-        called_path: called_path,
-        reported: reported?,
-        initially_closed: initially_closed
-      )
+      if run_executable
+        RunCountUpdater.perform_later(
+          key: key,
+          limit_count: run_limit_count,
+          called_path: called_path,
+          reported: reported?,
+          initially_closed: initially_closed
+        )
+      end
     end
 
     def execute_report
@@ -55,6 +59,7 @@ module CircuitSwitch
         key: key,
         limit_count: report_limit_count,
         called_path: called_path,
+        stacktrace: StacktraceModifier.call(backtrace: caller),
         run: run?
       )
       @reported = true

data/lib/circuit_switch/notification.rb

@@ -10,7 +10,7 @@ module CircuitSwitch
   class CalledNotification < CircuitSwitchNotification
     def to_message(called_path:)
       if ::CircuitSwitch.config.with_backtrace
-        "#{message}\ncalled_path: #{called_path}\n#{StacktraceModifier.call(backtrace: backtrace)}"
+        "#{message}\ncalled_path: #{called_path}\n#{backtrace.join("\n")}"
       else
         message
       end

data/lib/circuit_switch/stacktrace_modifier.rb

@@ -6,10 +6,14 @@ module CircuitSwitch
       delegate :config, to: ::CircuitSwitch
 
       def call(backtrace:)
-        backtrace
-          .select { |path| /(#{config.allowed_backtrace_paths.join('|')})/.match?(path) }
-          .map { |path| path.sub(/(#{config.strip_paths.join('|')})/, '') }
-          .join("\n")
+        if config.with_backtrace
+          backtrace
+            .select { |path| /(#{config.allowed_backtrace_paths.join('|')})/.match?(path) }
+            .map { |path| path.sub(/(#{config.strip_paths.join('|')})/, '') }
+        else
+          backtrace
+            .select { |path| /(#{config.allowed_backtrace_paths.join('|')})/.match?(path) }
+        end
       end
     end
   end

data/lib/circuit_switch/version.rb

@@ -1,3 +1,3 @@
 module CircuitSwitch
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/lib/circuit_switch/workers/reporter.rb

@@ -5,7 +5,7 @@ module CircuitSwitch
   class Reporter < ::ActiveJob::Base
     delegate :config, to: ::CircuitSwitch
 
-    def perform(key:, limit_count:, called_path:, run:)
+    def perform(key:, limit_count:, called_path:, stacktrace:, run:)
       # Wait for RunCountUpdater saves circuit_switch
       sleep(3) if run
 
@@ -27,6 +27,7 @@ module CircuitSwitch
         sleep(2)
         retry
       rescue CalledNotification => notification
+        notification.set_backtrace(stacktrace)
         if config.reporter.arity == 1
           config.reporter.call(notification.to_message(called_path: called_path))
         else

data/lib/circuit_switch.rb

@@ -31,7 +31,7 @@ module CircuitSwitch
         close_if_reach_limit: close_if_reach_limit,
         limit_count: limit_count,
         initially_closed: initially_closed,
-      }.select { |_, v| v }
+      }.reject { |_, v| v.nil? }
       Builder.new.run(**arguments, &block)
     end
 
@@ -52,7 +52,7 @@ module CircuitSwitch
         stop_report_if: stop_report_if,
         stop_report_if_reach_limit: stop_report_if_reach_limit,
         limit_count: limit_count
-      }.select { |_, v| v }
+      }.reject { |_, v| v.nil? }
       Builder.new.report(**arguments)
     end
 
@@ -76,7 +76,7 @@ module CircuitSwitch
         close_if_reach_limit: close_if_reach_limit,
         limit_count: limit_count,
         initially_closed: initially_closed,
-      }.select { |_, v| v }
+      }.reject { |_, v| v.nil? }
       Builder.new.run(**arguments) {}.run?
     end
   end

data/lib/generators/circuit_switch/templates/initializer.rb

@@ -34,7 +34,6 @@ CircuitSwitch.configure do |config|
   # config.with_backtrace = false
 
   # Allowed backtrace paths to report
-  # Specify with `with_backtrace` option.
   # Allowed all paths when set `[]`.
   # config.allowed_backtrace_paths = [Dir.pwd]
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: circuit_switch
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - makicamel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-09 00:00:00.000000000 Z
+date: 2021-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob