uv-rays 1.3.8 → 2.0.1

data/lib/uv-rays/http/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true, encoding: ASCII-8BIT
+
 require 'uri'
 require 'cgi'
 require 'rubyntlm'
@@ -130,10 +132,9 @@ module UV
                     transport.write(request_header).catch @error
 
                     # Send file
-                    fileRef = @endpoint.loop.file file, File::RDONLY
-                    fileRef.progress do
+                    fileRef = @endpoint.reactor.file file, File::RDONLY do
                         # File is open and available for reading
-                        pSend = fileRef.send_file(transport, :raw)
+                        pSend = fileRef.send_file(transport, using: :raw, wait: :promise)
                         pSend.catch @error
                         pSend.finally do
                             fileRef.close

data/lib/uv-rays/http_endpoint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'uri'
 
 module UV
@@ -40,7 +42,7 @@ module UV
                 use_tls(client.tls_options) if tls
             end
 
-            attr_accessor :request
+            attr_accessor :request, :reason
 
             def on_read(data, *args) # user to define
                 @client.data_received(data)
@@ -56,7 +58,7 @@ module UV
             def on_close # user to define
                 req = @request
                 @request = nil
-                @client.connection_closed(req)
+                @client.connection_closed(req, @reason)
             end
 
             def close_connection(request = nil)
@@ -79,7 +81,7 @@ module UV
         def initialize(host, options = {})
             @queue = []
             @parser = Http::Parser.new
-            @thread = Libuv::Loop.current || Libuv::Loop.default
+            @thread = reactor
             @connection = nil
 
             @options = @@defaults.merge(options)
@@ -106,16 +108,16 @@ module UV
         attr_reader :cookiejar, :middleware
 
 
-        def get      options = {}, &blk;  request(:get,     options, &blk); end
-        def head     options = {}, &blk;  request(:head,    options, &blk); end
-        def delete   options = {}, &blk;  request(:delete,  options, &blk); end
-        def put      options = {}, &blk;  request(:put,     options, &blk); end
-        def post     options = {}, &blk;  request(:post,    options, &blk); end
-        def patch    options = {}, &blk;  request(:patch,   options, &blk); end
-        def options  options = {}, &blk;  request(:options, options, &blk); end
+        def get(options = {});     request(:get,     options); end
+        def head(options = {});    request(:head,    options); end
+        def delete(options = {});  request(:delete,  options); end
+        def put(options = {});     request(:put,     options); end
+        def post(options = {});    request(:post,    options); end
+        def patch(options = {});   request(:patch,   options); end
+        def options(options = {}); request(:options, options); end
 
 
-        def request(method, options = {}, &blk)
+        def request(method, options = {})
             options = @options.merge(options)
             options[:method] = method
 
@@ -154,7 +156,7 @@ module UV
             end
         end
 
-        def connection_closed(request)
+        def connection_closed(request, reason)
             # We may have closed a previous connection
             if @parser.request && (request.nil? || request == @parser.request)
                 @connection = nil
@@ -163,7 +165,7 @@ module UV
                 @parser.eof
             elsif request.nil? && @parser.request.nil? && @queue.length > 0
                 req = @queue.pop
-                req.reject :connection_failure
+                req.reject(reason || :connection_failure)
             end
         end
 
@@ -233,7 +235,8 @@ module UV
         end
 
         def idle_timeout
-            @parser.reason = :timeout
+            @parser.reason = :timeout if @parser.request
+            @connection.reason = :timeout
             close_connection
         end
     end

data/lib/uv-rays/scheduler.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module UV
 
@@ -13,22 +14,25 @@ module UV
 
         def initialize(scheduler)
             # Create a dummy deferrable
-            loop = scheduler.loop
-            defer = loop.defer
+            reactor = scheduler.reactor
+            defer = reactor.defer
+
+            # Record a backtrace of where the schedule was created
+            @trace = caller
 
             # Setup common event variables
             @scheduler = scheduler
-            @created = loop.now
+            @created = reactor.now
             @last_scheduled = @created
             @trigger_count = 0
 
             # init the promise
-            super(loop, defer)
+            super(reactor, defer)
         end
 
         # Provide relevant inspect information
         def inspect
-            insp = "#<#{self.class}:0x#{self.__id__.to_s(16)} "
+            insp = String.new("#<#{self.class}:0x#{self.__id__.to_s(16)} ")
             insp << "trigger_count=#{@trigger_count} "
             insp << "config=#{info} " if self.respond_to?(:info, true)
             insp << "next_scheduled=#{@next_scheduled} "
@@ -51,7 +55,7 @@ module UV
         # notify listeners of the event
         def trigger
             @trigger_count += 1
-            @defer.notify(@loop.now, self)
+            @defer.notify(@reactor.now, self)
         end
     end
 
@@ -64,7 +68,7 @@ module UV
 
         # Updates the scheduled time
         def update(time)
-            @last_scheduled = @loop.now
+            @last_scheduled = @reactor.now
             
             parsed_time = Scheduler.parse_in(time, :quiet)
             if parsed_time.nil?
@@ -114,14 +118,14 @@ module UV
         # can be used to reset a repeating timer
         def resume
             @paused = false
-            @last_scheduled = @loop.now
+            @last_scheduled = @reactor.now
             reschedule
         end
 
         # Runs the event and reschedules
         def trigger
             super()
-            @loop.next_tick do
+            @reactor.next_tick do
                 # Do this next tick to avoid needless scheduling
                 # if the event is stopped in the callback
                 reschedule
@@ -133,7 +137,7 @@ module UV
 
 
         def next_time
-            @last_scheduled = @loop.now
+            @last_scheduled = @reactor.now
             if @every.is_a? Fixnum
                 @next_scheduled = @last_scheduled + @every
             else
@@ -156,13 +160,13 @@ module UV
 
 
     class Scheduler
-        attr_reader :loop
+        attr_reader :reactor
         attr_reader :time_diff
         attr_reader :next
 
 
-        def initialize(loop)
-            @loop = loop
+        def initialize(reactor)
+            @reactor = reactor
             @schedules = Set.new
             @scheduled = []
             @next = nil     # Next schedule time
@@ -174,8 +178,8 @@ module UV
 
             # as the libuv time is taken from an arbitrary point in time we
             # need to roughly synchronize between it and ruby's Time.now
-            @loop.update_time
-            @time_diff = (Time.now.to_f * 1000).to_i - @loop.now
+            @reactor.update_time
+            @time_diff = (Time.now.to_f * 1000).to_i - @reactor.now
         end
 
 
@@ -203,7 +207,7 @@ module UV
         # @return [::UV::OneShot]
         def in(time, callback = nil, &block)
             callback ||= block
-            ms = @loop.now + Scheduler.parse_in(time)
+            ms = @reactor.now + Scheduler.parse_in(time)
             event = OneShot.new(self, ms)
 
             if callback.respond_to? :call
@@ -315,7 +319,7 @@ module UV
         # Ensures the current timer, if any, is still
         # accurate by checking the head of the schedule
         def check_timer
-            @loop.update_time
+            @reactor.update_time
             
             existing = @next
             schedule = @scheduled.first
@@ -330,7 +334,7 @@ module UV
                 end
 
                 if not @next.nil?
-                    in_time = @next - @loop.now
+                    in_time = @next - @reactor.now
 
                     # Ensure there are never negative start times
                     if in_time > 3
@@ -352,7 +356,7 @@ module UV
 
                 # execute schedules that are within 3ms of this event
                 # Basic timer coalescing..
-                now = @loop.now + 3
+                now = @reactor.now + 3
                 while @scheduled.first && @scheduled.first.next_scheduled <= now
                     schedule = @scheduled.shift
                     @schedules.delete(schedule)
@@ -364,7 +368,7 @@ module UV
 
         # Provide some assurances on timer failure
         def new_timer
-            @timer = @loop.timer @timer_callback
+            @timer = @reactor.timer @timer_callback
             @timer.finally do
                 new_timer
                 unless @next.nil?
@@ -376,9 +380,9 @@ module UV
 end
 
 module Libuv
-    class Loop
+    class Reactor
         def scheduler
-            @scheduler ||= UV::Scheduler.new(@loop)
+            @scheduler ||= UV::Scheduler.new(@reactor)
             @scheduler
         end
     end

data/lib/uv-rays/scheduler/cron.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright (c) 2006-2013, John Mettraux, jmettraux@gmail.com
 #

data/lib/uv-rays/scheduler/time.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright (c) 2006-2013, John Mettraux, jmettraux@gmail.com
 #
@@ -198,7 +200,7 @@ module UV
 
             return (options[:drop_seconds] ? '0m' : '0s') if h.empty?
 
-            s = DU_KEYS.inject('') { |r, key|
+            s = DU_KEYS.inject(String.new) { |r, key|
                 count = h[key]
                 count = nil if count == 0
                 r << "#{count}#{key}" if count

data/lib/uv-rays/tcp_server.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 
 module UV
     class TcpServer < ::Libuv::TCP
-        def initialize(loop, server, port, klass, *args)
-            super(loop)
+        def initialize(reactor, server, port, klass, *args)
+            super(reactor)
 
             @klass = klass
             @args = args

data/lib/uv-rays/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UV
-    VERSION = '1.3.8'
+    VERSION = '2.0.1'
 end

data/spec/connection_spec.rb

@@ -12,13 +12,13 @@ module TestConnect
 
 	def on_close
 		@disconnected = true
-		@loop.stop
+		@reactor.stop
 	end
 
 	def on_read(data, connection, port = nil, udp_test = nil)
 		@received = data
 		close_connection(:after_writing)
-		@loop.stop if udp_test 	# misc is set when test connect is a UDP connection
+		@reactor.stop if udp_test 	# misc is set when test connect is a UDP connection
 	end
 
 	def check
@@ -48,10 +48,17 @@ end
 
 describe UV::Connection do
 	before :each do
-		@loop = Libuv::Loop.new
+		@reactor = Libuv::Reactor.new
+		@reactor.notifier do |error, context|
+			begin
+				@general_failure << "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+			rescue Exception
+				@general_failure << "error in logger #{e.inspect}"
+			end
+		end
 		@general_failure = []
-		@timeout = @loop.timer do
-			@loop.stop
+		@timeout = @reactor.timer do
+			@reactor.stop
 			@general_failure << "test timed out"
 		end
 		@timeout.start(5000)
@@ -74,15 +81,7 @@ describe UV::Connection do
 	
 	describe 'basic tcp client server' do
 		it "should send some data and shutdown the socket" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				UV.start_server '127.0.0.1', 3210, TestServer
 				@klass = UV.connect '127.0.0.1', 3210, TestConnect
 			}
@@ -95,15 +94,7 @@ describe UV::Connection do
 		end
 
 		it "should not call connect on connection failure" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				@klass = UV.connect '127.0.0.1', 8123, TestConnect
 			}
 
@@ -117,15 +108,7 @@ describe UV::Connection do
 
 	describe 'basic tcp client server with tls' do
 		it "should send some data and shutdown the socket" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				UV.start_server '127.0.0.1', 3212, TestServer, :use_tls
 				@klass = UV.connect '127.0.0.1', 3212, TestConnect
 				@klass.use_tls
@@ -141,15 +124,7 @@ describe UV::Connection do
 
 	describe 'basic udp client server' do
 		it "should send some data and close the socket" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				UV.open_datagram_socket TestServer, '127.0.0.1', 3210
 				@klass = UV.open_datagram_socket TestConnect, '127.0.0.1', 3211
 				@klass.send_datagram('hello', '127.0.0.1', 3210)

data/spec/http_endpoint_spec.rb

@@ -171,31 +171,32 @@ end
 
 describe UV::HttpEndpoint do
 	before :each do
-		@loop = Libuv::Loop.new
 		@general_failure = []
-		@timeout = @loop.timer do
-			@loop.stop
+
+		@reactor = Libuv::Reactor.new
+		@reactor.notifier do |error, context|
+			begin
+				@general_failure << "Log called: #{context}\n#{error.message}\n#{error.backtrace.join("\n") if error.backtrace}\n"
+			rescue Exception
+				@general_failure << "error in logger #{e.inspect}"
+			end
+		end
+
+		@timeout = @reactor.timer do
+			@reactor.stop
 			@general_failure << "test timed out"
 		end
 		@timeout.start(5000)
 
 		@request_failure = proc { |err|
 			@general_failure << err
-			@loop.stop
+			@reactor.stop
 		}
 	end
 
 	describe 'basic http request' do
 		it "should send a request then receive a response" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				tcp = UV.start_server '127.0.0.1', 3250, HttpServer
 				server = UV::HttpEndpoint.new 'http://127.0.0.1:3250'
 
@@ -203,7 +204,7 @@ describe UV::HttpEndpoint do
 				request.then(proc { |response|
 					@response = response
 					tcp.close
-					@loop.stop
+					@reactor.stop
 				}, @request_failure)
 			}
 
@@ -219,15 +220,7 @@ describe UV::HttpEndpoint do
 
 		it "should return the response when no length is given and the connection is closed" do
 			# I've seen IoT devices do this (projector screen controllers etc)
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				tcp = UV.start_server '127.0.0.1', 3250, WeirdServer
 				server = UV::HttpEndpoint.new 'http://127.0.0.1:3250'
 
@@ -235,7 +228,7 @@ describe UV::HttpEndpoint do
 				request.then(proc { |response|
 					@response = response
 					tcp.close
-					@loop.stop
+					@reactor.stop
 				}, @request_failure)
 			}
 
@@ -250,29 +243,21 @@ describe UV::HttpEndpoint do
 		end
 
 		it "should send multiple requests on the same connection" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				tcp = UV.start_server '127.0.0.1', 3250, HttpServer
 				server = UV::HttpEndpoint.new 'http://127.0.0.1:3250'
 
 				request = server.get(path: '/whatwhat', req: 1)
 				request.then(proc { |response|
 					@response = response
-					#@loop.stop
+					#@reactor.stop
 				}, @request_failure)
 
 				request2 = server.get(path: '/', req: 2)
 				request2.then(proc { |response|
 					@response2 = response
 					tcp.close
-					@loop.stop
+					@reactor.stop
 				}, @request_failure)
 			}
 
@@ -293,15 +278,7 @@ describe UV::HttpEndpoint do
 
 	describe 'old http request' do
 		it "should send a request then receive a response" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				tcp = UV.start_server '127.0.0.1', 3250, OldServer
 				server = UV::HttpEndpoint.new 'http://127.0.0.1:3250'
 
@@ -309,7 +286,7 @@ describe UV::HttpEndpoint do
 				request.then(proc { |response|
 					@response = response
 					tcp.close
-					@loop.stop
+					@reactor.stop
 				}, @request_failure)
 			}
 
@@ -322,29 +299,21 @@ describe UV::HttpEndpoint do
 		end
 
 		it "should send multiple requests" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				tcp = UV.start_server '127.0.0.1', 3251, OldServer
 				server = UV::HttpEndpoint.new 'http://127.0.0.1:3251'
 
 				request = server.get(:path => '/')
 				request.then(proc { |response|
 					@response = response
-					#@loop.stop
+					#@reactor.stop
 				}, @request_failure)
 
 				request2 = server.get(:path => '/')
 				request2.then(proc { |response|
 					@response2 = response
 					tcp.close
-					@loop.stop
+					@reactor.stop
 				}, @request_failure)
 			}
 
@@ -365,15 +334,7 @@ describe UV::HttpEndpoint do
 
 	describe 'Auth support' do
 		it "should perform NTLM auth transparently" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				tcp = UV.start_server '127.0.0.1', 3252, NTLMServer
 				server = UV::HttpEndpoint.new 'http://127.0.0.1:3252', ntlm: {
 					user: 'username',
@@ -385,7 +346,7 @@ describe UV::HttpEndpoint do
 				request.then(proc { |response|
 					@response = response
 					tcp.close
-					@loop.stop
+					@reactor.stop
 				}, @request_failure)
 			}
 
@@ -399,15 +360,7 @@ describe UV::HttpEndpoint do
 		end
 
 		it "should perform Digest auth transparently" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				tcp = UV.start_server '127.0.0.1', 3252, DigestServer
 				server = UV::HttpEndpoint.new 'http://127.0.0.1:3252', digest: {
 					user: 'Mufasa',
@@ -418,7 +371,7 @@ describe UV::HttpEndpoint do
 				request.then(proc { |response|
 					@response = response
 					tcp.close
-					@loop.stop
+					@reactor.stop
 				}, @request_failure)
 			}
 
@@ -434,15 +387,7 @@ describe UV::HttpEndpoint do
 
 	describe 'cookies' do
 		it "should accept cookies and send them on subsequent requests" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				tcp = UV.start_server '127.0.0.1', 3250, HttpServer
 				@server = UV::HttpEndpoint.new 'http://127.0.0.1:3250'
 
@@ -451,7 +396,7 @@ describe UV::HttpEndpoint do
 
 				request.then(proc { |response|
 					tcp.close
-					@loop.stop
+					@reactor.stop
 				}, @request_failure)
 			}
 
@@ -463,15 +408,7 @@ describe UV::HttpEndpoint do
 
 	describe 'when things go wrong' do
 		it "should reconnect after connection dropped and continue sending requests" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				tcp = UV.start_server '127.0.0.1', 6353, BrokenServer
 				server = UV::HttpEndpoint.new 'http://127.0.0.1:6353'
 
@@ -479,7 +416,7 @@ describe UV::HttpEndpoint do
 				request = server.get(:path => '/')
 				request.then(proc { |response|
 					@response = response
-					#@loop.stop
+					#@reactor.stop
 				}, proc { |error|
 					@error = error
 				})
@@ -488,7 +425,7 @@ describe UV::HttpEndpoint do
 				request2.then(proc { |response|
 					@response2 = response
 					tcp.close
-					@loop.stop
+					@reactor.stop
 				}, @request_failure)
 			}
 
@@ -505,15 +442,7 @@ describe UV::HttpEndpoint do
 		end
 
 		it "should reconnect after timeout and continue sending requests" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				tcp = UV.start_server '127.0.0.1', 6363, SlowServer
 				server = UV::HttpEndpoint.new 'http://127.0.0.1:6363', inactivity_timeout: 500
 
@@ -521,7 +450,7 @@ describe UV::HttpEndpoint do
 				request = server.get(:path => '/')
 				request.then(proc { |response|
 					@response = response
-					#@loop.stop
+					#@reactor.stop
 				}, proc { |error|
 					@error = error
 				})
@@ -530,7 +459,7 @@ describe UV::HttpEndpoint do
 				request2.then(proc { |response|
 					@response2 = response
 					tcp.close
-					@loop.stop
+					@reactor.stop
 				}, @request_failure)
 			}
 
@@ -547,15 +476,7 @@ describe UV::HttpEndpoint do
 		end
 
 		it "should fail if the server is not available" do
-			@loop.run { |logger|
-				logger.progress do |level, errorid, error|
-					begin
-						@general_failure << "Log called: #{level}: #{errorid}\n#{error.message}\n#{error.backtrace.join("\n")}\n"
-					rescue Exception
-						@general_failure << 'error in logger'
-					end
-				end
-
+			@reactor.run { |reactor|
 				server = UV::HttpEndpoint.new 'http://127.0.0.1:6666', inactivity_timeout: 500
 
 				@response = nil
@@ -564,7 +485,7 @@ describe UV::HttpEndpoint do
 				request = server.get(:path => '/')
 				request.then(proc { |response|
 					@response = response
-					#@loop.stop
+					#@reactor.stop
 				}, proc { |error|
 					@error = error
 				})
@@ -572,10 +493,10 @@ describe UV::HttpEndpoint do
 				request2 = server.get(:path => '/')
 				request2.then(proc { |response|
 					@response2 = response
-					@loop.stop
+					@reactor.stop
 				}, proc { |error|
 					@error2 = error
-					@loop.stop
+					@reactor.stop
 				})
 			}