Retry IO.select in Probe Server instead of returning early (#1034)

bensheldon · Aug 8, 2023 · 8f96279 · 8f96279
1 parent e062cee
commit 8f96279
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/lib/good_job/http_server.rb b/lib/good_job/http_server.rb
@@ -44,7 +44,7 @@ def handle_connections
       while @running.true?
         begin
           ready_sockets, = IO.select([@server], nil, nil, SOCKET_READ_TIMEOUT)
-          return unless ready_sockets
+          next unless ready_sockets
 
           client = @server.accept_nonblock(exception: false)
           request = client.gets

diff --git a/spec/lib/good_job/probe_server_spec.rb b/spec/lib/good_job/probe_server_spec.rb
@@ -24,6 +24,15 @@
         ip_addresses.each do |ip_address|
           response = Net::HTTP.get(ip_address, "/", port)
           expect(response).to eq("OK")
+
+          response = Net::HTTP.get(ip_address, "/status", port)
+          expect(response).to eq("OK")
+
+          response = Net::HTTP.get(ip_address, "/status/started", port)
+          expect(response).to eq("Not started")
+
+          response = Net::HTTP.get(ip_address, "/status/connected", port)
+          expect(response).to eq("Not connected")
         end
       end
     end