business_flow 0.19.1 → 0.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3cbbc4f9a0eba68f3056378a62625b0b855957945fb45392fe3101455aa3df3
-  data.tar.gz: 4b47a1c7479257c75814abdaaa023e9cc58c01e169eacfd95276c26441c64203
+  metadata.gz: 0f141ad60cea86b41612d48091f29916ed512b95136f665a0e99fce1b9cddf60
+  data.tar.gz: b2342e16e41780165029b2605fe545ff940939903a85c7f749704e3af443a126
 SHA512:
-  metadata.gz: 15aa3e482853c9f9022729f3e44e4f4e566695b23393339c3fb11915127c0003992de7fb04e4515725e99fbb2dddfe6bd8c1d9dcbb8dc7ee82c523a956181b3b
-  data.tar.gz: 947c46bdd62b88e8a5d588d3258a8df4f0820b0dd8ba408329fd6b4dc3acf16019465e242bbb1a0ebb0806af1f367813fc1c5735e66c52e15ca4a330e9b0cf49
+  metadata.gz: b48a9c480de3bbb78c0fe1f2bdadb7b05e8f93068eac08d5b9aa21999d5c6f54b97febee0366de7c49ea4dafd8a3e87d362a6d70e0e2dc3997ee0a25eda1deb2
+  data.tar.gz: cef0b142c7f352dc83cf786a5a2df98a37101c58f8b7c75fda2fa0cc113211531657aaeb7813f88b8738ea6bd8d7ce49e2b9aeb00adf88766f31b16e8ec7012b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    business_flow (0.19.1)
+    business_flow (0.19.3)
       activemodel (>= 4.2, < 8)
       activesupport (>= 4.2, < 8)
 

data/lib/business_flow/cluster_lock.rb

@@ -40,6 +40,14 @@ module BusinessFlow
       raise
     end
 
+    def read_attribute_for_validation(key)
+      if key == :cluster_lock
+        ClassMethods.lock_name(self)
+      else
+        super(key)
+      end
+    end
+
     # DSL Methods
     module ClassMethods
       # Error raised when there is an internal issue with acquiring a lock.
@@ -169,22 +177,38 @@ module BusinessFlow
       end
 
       def self.cleanup(lock, zk_connection)
-        lock.unlock if lock
+        begin
+          lock.unlock if lock
+        rescue ZK::Exceptions::OperationTimeOut
+          # Just let the connection close handle this.
+        end
         zk_connection.close! if zk_connection
       end
 
+      # :reek:ControlParameter
+      # I'm using a case statement instead of a hash in a constant to ensure that this
+      # doesn't throw exceptions if this file is required before zookeeper is.
+      def self.exception_to_error_type(exc)
+        case exc
+        when ZK::Exceptions::LockAssertionFailedError
+          :assert_failed
+        when ZK::Exceptions::OperationTimeOut
+          :zookeeper_timeout
+        else
+          :unknown_failure
+        end
+      end
+
       def self.with_lock(flow, lock_info, &blk)
         zk_connection, lock =
           if !BusinessFlow::ClusterLock.disabled?
             instrumented_acquire_lock(flow, lock_info)
           end
         yield lock_info
-      rescue ZK::Exceptions::LockAssertionFailedError => exc
+      rescue ZK::Exceptions::LockAssertionFailedError, ZK::Exceptions::OperationTimeOut => exc
         # This would occur if we asserted a cluster lock while executing the flow.
         # This will have set an error on the flow, so we can carry on.
-        raise LockFailure.new(:assert_failed, exc.message)
-      rescue ZK::Exceptions::OperationTimeOut
-        # Sometimes this happens. Just let the ensure block take care of everything
+        raise LockFailure.new(exception_to_error_type(exc), exc.message)
       ensure
         cleanup(lock, zk_connection)
       end

data/lib/business_flow/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BusinessFlow
-  VERSION = '0.19.1'.freeze
+  VERSION = '0.19.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: business_flow
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.3
 platform: ruby
 authors:
 - Alex Scarborough
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-19 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel