async-pool 0.3.4 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53496ca8f02b057c94d8cef37e92f7d14bb3d7062267ea53f363d5ca3c2ee7d4
-  data.tar.gz: b59bb3a498bb16b1306eea4b6bcb765efa60a479701f546a3c2b6785ff5203e1
+  metadata.gz: cc9d27508f2aedf6acd28b377ecedf2a05a1b8d18441aa523e5ddcdb1f3a726b
+  data.tar.gz: b18617893727bbe6d2a90adaafdcc7e92d8847c4ecb3a7caa519e183a7439be7
 SHA512:
-  metadata.gz: f53063512c044675725eed75b72346644a36c99704bf2f1559692420f7176b88063cb79200d4a24f19f8cd081be224e307a811d91dc8a94923cccb87cf850cc4
-  data.tar.gz: 366355082c92722989dd76607f611fd81f520844b8733e15872db4164a146bc2e257e40f316bc87c173a49b65d465e07cccdf459fea242b9c8445841c13f7580
+  metadata.gz: 39fe6f2c7f4eae7c215c779c1989814fb6f7126aaa6963ec8ee2c73f3f20132b4a985de53819a064f2fab5813a25131bf907c72e0b13758f24a17b6543a01072
+  data.tar.gz: e7f584de1b1bea95655e00b76b167268d74ae54f76e15a6bee614513575f7d3f7e108bade126a8c2c598a4fd8bde8857a8d26481842ef5eac5b00551d9550f07

data/lib/async/pool/controller.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/logger'
+require 'console/logger'
 
 require 'async'
 require 'async/notification'
@@ -98,15 +98,19 @@ module Async
 			
 			# Make the resource resources and let waiting tasks know that there is something resources.
 			def release(resource)
+				reused = false
+				
 				# A resource that is not good should also not be reusable.
 				if resource.reusable?
-					reuse(resource)
-				else
-					retire(resource)
+					reused = reuse(resource)
 				end
+			ensure
+				retire(resource) unless reused
 			end
 			
 			def close
+				@available.clear
+				
 				@resources.each_key(&:close)
 				@resources.clear
 				
@@ -155,7 +159,7 @@ module Async
 			end
 			
 			def retire(resource)
-				Async.logger.debug(self) {"Retire #{resource}"}
+				Console.logger.debug(self) {"Retire #{resource}"}
 				
 				@resources.delete(resource)
 				
@@ -169,7 +173,7 @@ module Async
 			def start_gardener
 				return if @gardener
 				
-				Async(transient: true) do |task|
+				Async(transient: true, annotation: "#{self.class} Gardener") do |task|
 					@gardener = task
 					
 					Task.yield
@@ -205,7 +209,7 @@ module Async
 			end
 			
 			def reuse(resource)
-				Async.logger.debug(self) {"Reuse #{resource}"}
+				Console.logger.debug(self) {"Reuse #{resource}"}
 				usage = @resources[resource]
 				
 				if usage.zero?
@@ -227,6 +231,8 @@ module Async
 				@resources[resource] = usage - 1
 				
 				@notification.signal
+				
+				return true
 			end
 			
 			def wait_for_resource
@@ -235,7 +241,7 @@ module Async
 					@notification.wait
 				end
 				
-				Async.logger.debug(self) {"Wait for resource -> #{resource}"}
+				Console.logger.debug(self) {"Wait for resource -> #{resource}"}
 				
 				# if resource.concurrency > 1
 				# 	@notification.signal
@@ -263,36 +269,45 @@ module Async
 			
 			# @returns [Object] An existing resource in a "used" state.
 			def available_resource
+				resource = nil
+				
 				@guard.acquire do
-					while resource = @available.last
-						if usage = @resources[resource] and usage < resource.concurrency
-							if resource.viable?
-								usage = (@resources[resource] += 1)
-								
-								if usage == resource.concurrency
-									# The resource is used up to it's limit:
-									@available.pop
-								end
-								
-								return resource
-							else
-								retire(resource)
+					resource = get_resource
+				end
+				
+				return resource
+			rescue Exception
+				reuse(resource) if resource
+				raise
+			end
+			
+			private def get_resource
+				while resource = @available.last
+					if usage = @resources[resource] and usage < resource.concurrency
+						if resource.viable?
+							usage = (@resources[resource] += 1)
+							
+							if usage == resource.concurrency
+								# The resource is used up to it's limit:
 								@available.pop
 							end
+							
+							return resource
 						else
-							# The resource has been removed already, so skip it and remove it from the availability list.
+							retire(resource)
 							@available.pop
 						end
-					end
-					
-					if @limit.nil? or @resources.size < @limit
-						Async.logger.debug(self) {"No available resources, allocating new one..."}
-						
-						return create_resource
+					else
+						# The resource has been removed already, so skip it and remove it from the availability list.
+						@available.pop
 					end
 				end
 				
-				return nil
+				if @limit.nil? or @resources.size < @limit
+					Console.logger.debug(self) {"No available resources, allocating new one..."}
+					
+					return create_resource
+				end
 			end
 		end
 	end

data/lib/async/pool/resource.rb

@@ -18,7 +18,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-require 'async/logger'
+require 'console/logger'
 
 require 'async/notification'
 require 'async/semaphore'

data/lib/async/pool/version.rb

@@ -20,6 +20,6 @@
 
 module Async
 	module Pool
-		VERSION = "0.3.4"
+		VERSION = "0.3.8"
 	end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: async-pool
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.8
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-07 00:00:00.000000000 Z
+date: 2021-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.25'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.25'
 - !ruby/object:Gem::Dependency
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: A singleplex and multiplex resource pool for implementing robust clients.