Use less stringent timeouts in REST client

BernhardWebstudio · Dec 27, 2023 · 477b3af · 477b3af
1 parent acea008
commit 477b3af
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/main/java/edu/harvard/mcz/imagecapture/data/NahimaManager.java b/src/main/java/edu/harvard/mcz/imagecapture/data/NahimaManager.java
@@ -153,7 +153,7 @@ public ArrayList<JSONObject> uploadImagesForSpecimen(Specimen specimen) throws I
             MultipartBodyPublisher multipartBody = MultipartBodyPublisher.newBuilder().filePart("image", Path.of(imagePath), MediaType.IMAGE_ANY).build();
             log.debug("Built multipart body...");
             MutableRequest request = MutableRequest.POST(queryUrl, multipartBody).header("Content-Disposition", "attachment; filename=\"" + image.getFilename() + "\"");
-            log.debug("Built request to uplaod...");
+            log.debug("Built request to upload...");
             HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
 
             log.debug("Response from uploading image: " + response.body());

diff --git a/src/main/java/edu/harvard/mcz/imagecapture/utility/AbstractRestClient.java b/src/main/java/edu/harvard/mcz/imagecapture/utility/AbstractRestClient.java
@@ -31,11 +31,11 @@ public abstract class AbstractRestClient {
     public AbstractRestClient() {
         Methanol.Builder builder = Methanol.newBuilder()
                 .userAgent("DataShot " + ImageCaptureApp.getAppVersion())
-                .requestTimeout(Duration.ofSeconds(60))      // Default request timeout
-                .headersTimeout(Duration.ofSeconds(30))       // Timeout for receiving response headers
-                .readTimeout(Duration.ofSeconds(30));          // Timeout for single reads;
-        httpClient = builder.executor(Executors.newFixedThreadPool(4))
-                .connectTimeout(Duration.ofSeconds(60))
+                .requestTimeout(Duration.ofSeconds(360))      // Default request timeout
+                .headersTimeout(Duration.ofSeconds(120))       // Timeout for receiving response headers
+                .readTimeout(Duration.ofSeconds(60));          // Timeout for single reads;
+        httpClient = builder.executor(Executors.newFixedThreadPool(8))
+                .connectTimeout(Duration.ofSeconds(120))
                 .build();
     }