business_flow 0.19.2 → 0.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 594752766329fcaa20e52b6b17f3a0b864fb893453055d24dd8596e0a3f5dac5
-  data.tar.gz: c4c8a27b23c2bfdd63378d9a3da1f47e3f9c9f1e0b95eb7344575c30ef2651d0
+  metadata.gz: 0f141ad60cea86b41612d48091f29916ed512b95136f665a0e99fce1b9cddf60
+  data.tar.gz: b2342e16e41780165029b2605fe545ff940939903a85c7f749704e3af443a126
 SHA512:
-  metadata.gz: 0ac739ddbf16363e5d6397be8720205187a9ccaa043a11b26e67ccc33f72f83d354c713d2359ffec27bb8a2c9cd93422922aee25aefcec424cc4bc3c5f76226c
-  data.tar.gz: be38502bd0d953729bb48b723540dbc2288f5cd7eb56c5ef54e60854de6c2a4d185604f3d84c681c36906658058863d18ff86eb7a20144ee4a8d1d86fb033f40
+  metadata.gz: b48a9c480de3bbb78c0fe1f2bdadb7b05e8f93068eac08d5b9aa21999d5c6f54b97febee0366de7c49ea4dafd8a3e87d362a6d70e0e2dc3997ee0a25eda1deb2
+  data.tar.gz: cef0b142c7f352dc83cf786a5a2df98a37101c58f8b7c75fda2fa0cc113211531657aaeb7813f88b8738ea6bd8d7ce49e2b9aeb00adf88766f31b16e8ec7012b

data/Gemfile.lock

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

data/lib/business_flow/cluster_lock.rb

@@ -177,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.2'.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.2
+  version: 0.19.3
 platform: ruby
 authors:
 - Alex Scarborough
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel