Improve err logging

Signed-off-by: Paolo Di Tommaso <[email protected]>
seqeralabs · Sep 25, 2023 · a83b540 · a83b540
1 parent c313ec8
commit a83b540
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/groovy/io/seqera/wave/proxy/ProxyClient.groovy b/src/main/groovy/io/seqera/wave/proxy/ProxyClient.groovy
@@ -151,7 +151,7 @@ class ProxyClient {
                 final resp = get0(origin, headers, handler, followRedirect)
                 if( resp.statusCode() in HTTP_SERVER_ERRORS) {
                     // throws an IOException so that the condition is handled by the retry policy
-                    throw new IOException("Unexpected server response code ${resp.statusCode()} for request ${origin} - message: ${resp.body()}")
+                    throw new IOException("Unexpected server response code ${resp.statusCode()} for request 'GET ${origin}' - message: ${resp.body()}")
                 }
                 return resp
             }
@@ -261,7 +261,7 @@ class ProxyClient {
                 final resp = head0(uri,headers)
                 if( resp.statusCode() in HTTP_SERVER_ERRORS) {
                     // throws an IOException so that the condition is handled by the retry policy
-                    throw new IOException("Unexpected server response code ${resp.statusCode()} for request ${uri} - message: ${resp.body()}")
+                    throw new IOException("Unexpected server response code ${resp.statusCode()} for request 'HEAD ${uri}' - message: ${resp.body()}")
                 }
                 return resp
             }

diff --git a/src/main/groovy/io/seqera/wave/storage/reader/HttpContentReader.java b/src/main/groovy/io/seqera/wave/storage/reader/HttpContentReader.java
@@ -53,11 +53,11 @@ public byte[] readAllBytes() throws IOException, InterruptedException {
     @Override
     public InputStream openStream() throws IOException, InterruptedException {
         final HttpClient client = HttpClientFactory.newHttpClient();
-        HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).build();
+        HttpRequest request = HttpRequest.newBuilder().GET().uri(URI.create(url)).build();
         HttpResponse<InputStream> resp = client.send(request, HttpResponse.BodyHandlers.ofInputStream());
         if( HTTP_SERVER_ERRORS.contains(resp.statusCode()) ) {
             final String err = IOUtils.toString(resp.body(), Charset.defaultCharset());
-            final String msg = String.format("Unexpected server response code %d for request %s - message: %s", resp.statusCode(), url, err);
+            final String msg = String.format("Unexpected server response code %d for stream 'GET %s' - message: %s", resp.statusCode(), url, err);
             throw new HttpServerRetryableErrorException(msg);
         }
         return resp.body();