Improved annotations.

ioquatix · ioquatix · commit c290ee368f47 · 2020-04-21T00:11:13.000+12:00
diff --git a/async-http.gemspec b/async-http.gemspec
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 	
 	spec.add_dependency("protocol-http", "~> 0.18.0")
 	spec.add_dependency("protocol-http1", "~> 0.12.0")
-	spec.add_dependency("protocol-http2", "~> 0.13.0")
+	spec.add_dependency("protocol-http2", "~> 0.14.0")
 	
 	# spec.add_dependency("openssl")
 	
diff --git a/lib/async/http/body/pipe.rb b/lib/async/http/body/pipe.rb
@@ -60,7 +60,7 @@ def close
 				def reader(task)
 					@reader = task
 					
-					task.annotate "pipe reader"
+					task.annotate "#{self.class} reader."
 					
 					while chunk = @input.read
 						@head.write(chunk)
@@ -80,7 +80,7 @@ def reader(task)
 				def writer(task)
 					@writer = task
 					
-					task.annotate "pipe writer"
+					task.annotate "#{self.class} writer."
 					
 					while chunk = @head.read_partial
 						@output.write(chunk)
diff --git a/lib/async/http/client.rb b/lib/async/http/client.rb
@@ -83,7 +83,7 @@ def self.open(*arguments, **options, &block)
 			
 			def close
 				while @pool.busy?
-					Async.logger.warn(self) {"Waiting for pool to drain: #{@pool}"}
+					Async.logger.warn(self) {"Waiting for #{@protocol} pool to drain: #{@pool}"}
 					@pool.wait
 				end
 				
diff --git a/lib/async/http/protocol/http1/server.rb b/lib/async/http/protocol/http1/server.rb
@@ -56,7 +56,7 @@ def next_request
 					
 					# Server loop.
 					def each(task: Task.current)
-						task.annotate("#{version} reading requests for #{self.class}.")
+						task.annotate("Reading #{version} requests for #{self.class}.")
 						
 						while request = next_request
 							response = yield(request, self)
diff --git a/lib/async/http/protocol/http2/connection.rb b/lib/async/http/protocol/http2/connection.rb
@@ -66,7 +66,7 @@ def http2?
 					end
 					
 					def start_connection
-						@reader ||= read_in_background
+						@reader || read_in_background
 					end
 					
 					def close(error = nil)
@@ -93,7 +93,11 @@ def write_frames(&block)
 					end
 					
 					def read_in_background(parent: Task.current)
+						raise RuntimeError, "Connection is closed!" if closed?
+						
 						parent.async do |task|
+							@reader = task
+							
 							task.annotate("#{version} reading data for #{self.class}.")
 							
 							begin
@@ -130,7 +134,7 @@ def viable?
 					end
 					
 					def reusable?
-						!(self.closed? || @stream.closed?)
+						!self.closed?
 					end
 					
 					def version
diff --git a/lib/async/http/protocol/http2/server.rb b/lib/async/http/protocol/http2/server.rb
@@ -62,7 +62,7 @@ def close(error = nil)
 					end
 					
 					def each(task: Task.current)
-						task.annotate("#{version} reading requests for #{self.class}.")
+						task.annotate("Reading #{version} requests for #{self.class}.")
 						
 						# It's possible the connection has died before we get here...
 						@requests&.async do |task, request|
diff --git a/spec/async/http/proxy_spec.rb b/spec/async/http/proxy_spec.rb
@@ -142,23 +142,25 @@
 					upstream = Async::IO::Stream.new(endpoint.connect)
 					Async.logger.debug(self) {"Connected to #{upstream}..."}
 					
-					reader = Async do
+					reader = Async do |task|
+						task.annotate "Upstream reader."
+						
 						while chunk = upstream.read_partial
 							stream.write(chunk)
 							stream.flush
 						end
-						
 					ensure
 						Async.logger.debug(self) {"Finished reading from upstream..."}
 						stream.close_write
 					end
 					
-					writer = Async do
+					writer = Async do |task|
+						task.annotate "Upstream writer."
+						
 						while chunk = stream.read_partial
 							upstream.write(chunk)
 							upstream.flush
 						end
-						
 					rescue Async::Wrapper::Cancelled
 						#ignore
 					ensure
