Modernize logging.

Author: ioquatix

bake/async/http/h2spec.rb

@@ -30,7 +30,7 @@ def server
 
 	container = Async::Container.new
 
-	Console.logger.info(self){"Starting server..."}
+	Console.info(self){"Starting server..."}
 
 	container.run(count: 1) do
 		server = Async::HTTP::Server.for(endpoint, protocol: Async::HTTP::Protocol::HTTP2, scheme: "https") do |request|

examples/download/chunked.rb

@@ -20,7 +20,7 @@
 	headers = {"user-agent" => "curl/7.69.1", "accept" => "*/*"}
 
 	file = File.open("products.csv", "w")
-	Console.logger.info(self) {"Saving download to #{Dir.pwd}"}
+	Console.info(self) {"Saving download to #{Dir.pwd}"}
 
 	begin
 		response = client.head(endpoint.path, headers)
@@ -39,7 +39,7 @@
 		response&.close
 	end
 
-	Console.logger.info(self) {"Content length: #{content_length/(1024**2)}MiB"}
+	Console.info(self) {"Content length: #{content_length/(1024**2)}MiB"}
 
 	parts = []
 	offset = 0
@@ -56,7 +56,7 @@
 		offset += chunk_size
 	end
 
-	Console.logger.info(self) {"Breaking download into #{parts.size} parts..."}
+	Console.info(self) {"Breaking download into #{parts.size} parts..."}
 
 	semaphore = Async::Semaphore.new(8)
 	barrier = Async::Barrier.new(parent: semaphore)
@@ -65,21 +65,21 @@
 		barrier.async do
 			part = parts.shift
 
-			Console.logger.info(self) {"Issuing range request range: bytes=#{part.min}-#{part.max}"}
+			Console.info(self) {"Issuing range request range: bytes=#{part.min}-#{part.max}"}
 
 			response = client.get(endpoint.path, [
 				["range", "bytes=#{part.min}-#{part.max-1}"],
 				*headers
 			])
 
 			if response.success?
-				Console.logger.info(self) {"Got response: #{response}... writing data for #{part}."}
+				Console.info(self) {"Got response: #{response}... writing data for #{part}."}
 				written = file.pwrite(response.read, part.min)
 
 				amount += written
 
 				duration = Async::Clock.now - start_time
-				Console.logger.info(self) {"Rate: #{((amount.to_f/(1024**2))/duration).round(2)}MiB/s"}
+				Console.info(self) {"Rate: #{((amount.to_f/(1024**2))/duration).round(2)}MiB/s"}
 			end
 		end
 	end

examples/google/search.rb

@@ -14,7 +14,7 @@
 
 class Google < Protocol::HTTP::Middleware
 	def search(term)
-		Console.logger.info(self) {"Searching for #{term}..."}
+		Console.info(self) {"Searching for #{term}..."}
 
 		self.get("/search?q=#{term}", {"user-agent" => "Hi Google!"})
 	end
@@ -40,10 +40,10 @@ def search(term)
 			end
 		end.map(&:wait).to_h
 
-		Console.logger.info(self, name: "counts") {counts}
+		Console.info(self, name: "counts") {counts}
 	end
 
-	Console.logger.info(self, name: "duration") {duration}
+	Console.info(self, name: "duration") {duration}
 ensure
 	google.close
 end

examples/licenses/list.rb

@@ -63,7 +63,7 @@ def fetch_rubygem_license(name, version)
 rescue RateLimitingError
 	response.finish
 
-	Console.logger.warn(name) {"Rate limited..."}
+	Console.warn(name) {"Rate limited..."}
 	Async::Task.current.sleep(1.0)
 
 	retry

examples/stream/stop.rb

@@ -16,16 +16,16 @@
 		connection = response.connection
 
 		response.each do |chunk|
-			Console.logger.info(response) {chunk}
+			Console.info(response) {chunk}
 		end
 	ensure
-		Console.logger.info(response) {"Closing response..."}
+		Console.info(response) {"Closing response..."}
 		response&.close
 	end
 
 	parent.sleep(5)
 
-	Console.logger.info(parent) {"Killing #{child}..."}
+	Console.info(parent) {"Killing #{child}..."}
 	child.stop
 ensure
 	internet&.close

lib/async/http/client.rb

@@ -81,7 +81,7 @@ def self.open(*arguments, **options, &block)
 
 			def close
 				while @pool.busy?
-					Console.logger.warn(self) {"Waiting for #{@protocol} pool to drain: #{@pool}"}
+					Console.warn(self) {"Waiting for #{@protocol} pool to drain: #{@pool}"}
 					@pool.wait
 				end
 
@@ -164,7 +164,7 @@ def make_pool(**options)
 				self.assign_default_tags(options[:tags] ||= {})
 
 				Async::Pool::Controller.wrap(**options) do
-					Console.logger.debug(self) {"Making connection to #{@endpoint.inspect}"}
+					Console.debug(self) {"Making connection to #{@endpoint.inspect}"}
 
 					@protocol.client(@endpoint.connect)
 				end

lib/async/http/protocol/http1/client.rb

@@ -32,7 +32,7 @@ def closed(error = nil)
 
 					# Used by the client to send requests to the remote server.
 					def call(request, task: Task.current)
-						Console.logger.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
+						Console.debug(self) {"#{request.method} #{request.path} #{request.headers.inspect}"}
 
 						# Mark the start of the trailers:
 						trailer = request.headers.trailer!

lib/async/http/protocol/http2/stream.rb

@@ -65,7 +65,7 @@ def process_headers(frame)
 							@input.close_write
 						end
 					rescue ::Protocol::HTTP2::HeaderError => error
-						Console.logger.debug(self, error)
+						Console.debug(self, "Error while processing headers!", error: error)
 
 						send_reset_stream(error.code)
 					end

lib/async/http/protocol/https.rb

@@ -25,7 +25,7 @@ def self.protocol_for(peer)
 					# alpn_protocol is only available if openssl v1.0.2+
 					name = peer.alpn_protocol
 
-					Console.logger.debug(self) {"Negotiating protocol #{name.inspect}..."}
+					Console.debug(self) {"Negotiating protocol #{name.inspect}..."}
 
 					if protocol = HANDLERS[name]
 						return protocol

lib/async/http/server.rb

@@ -45,14 +45,14 @@ def to_json(...)
 			def accept(peer, address, task: Task.current)
 				connection = @protocol.server(peer)
 
-				Console.logger.debug(self) {"Incoming connnection from #{address.inspect} to #{@protocol}"}
+				Console.debug(self) {"Incoming connnection from #{address.inspect} to #{@protocol}"}
 
 				connection.each do |request|
 					# We set the default scheme unless it was otherwise specified.
 					# https://tools.ietf.org/html/rfc7230#section-5.5
 					request.scheme ||= self.scheme
 
-					# Console.logger.debug(self) {"Incoming request from #{address.inspect}: #{request.method} #{request.path}"}
+					# Console.debug(self) {"Incoming request from #{address.inspect}: #{request.method} #{request.path}"}
 
 					# If this returns nil, we assume that the connection has been hijacked.
 					self.call(request)

test/async/http/proxy.rb

@@ -128,11 +128,11 @@
 				host, port = request.authority.split(":", 2)
 				endpoint = IO::Endpoint.tcp(host, port)
 
-				Console.logger.debug(self) {"Making connection to #{endpoint}..."}
+				Console.debug(self) {"Making connection to #{endpoint}..."}
 
 				Async::HTTP::Body::Hijack.response(request, 200, {}) do |stream|
 					upstream = ::IO::Stream::Buffered.wrap(endpoint.connect)
-					Console.logger.debug(self) {"Connected to #{upstream}..."}
+					Console.debug(self) {"Connected to #{upstream}..."}
 
 					reader = Async do |task|
 						task.annotate "Upstream reader."
@@ -142,7 +142,7 @@
 							stream.flush
 						end
 					ensure
-						Console.logger.debug(self) {"Finished reading from upstream..."}
+						Console.debug(self) {"Finished reading from upstream..."}
 						stream.close_write
 					end
 
@@ -154,7 +154,7 @@
 							upstream.flush
 						end
 					ensure
-						Console.logger.debug(self) {"Finished writing to upstream..."}
+						Console.debug(self) {"Finished writing to upstream..."}
 						upstream.close_write
 					end