Use the /readyz endpoint to simplify ready check

saucelabs · Oct 23, 2024 · 991382c · 991382c
1 parent 1b76926
commit 991382c
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/src/main/java/com/saucelabs/ci/sauceconnect/AbstractSauceTunnelManager.java b/src/main/java/com/saucelabs/ci/sauceconnect/AbstractSauceTunnelManager.java
@@ -785,23 +785,19 @@ public void run() {
 
     private void pollEndpoint() {
       HttpRequest request = HttpRequest.newBuilder()
-                        .uri(URI.create(String.format("http://localhost:%d/status", port)))
+                        .uri(URI.create(String.format("http://localhost:%d/readyz", port)))
                         .GET()
                         .build();
 
       try {
         HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
 
-        this.LOGGER.info("Got http response", response.statusCode());
-
         if (response.statusCode() == 200) {
           this.apiResponse = true;
-          String responseBody = response.body();
-          JSONObject jsonObject = new JSONObject(responseBody);
-          if (jsonObject.has("status") && "connected".equals(jsonObject.getString("status"))) {
-            this.LOGGER.info("Got connected status");
-            semaphore.release();
-          }
+          this.LOGGER.info("Got connected status");
+          semaphore.release();
+        } else if (response.statusCode() == 503) {
+          this.apiResponse = true;
         }
       } catch ( Exception e ) {
         if ( this.apiResponse ) {
@@ -812,7 +808,7 @@ private void pollEndpoint() {
         }
       }
 
-      this.LOGGER.info("No API response yet");
+      this.LOGGER.trace("No API response yet");
     }
   }
 }