[Feature/DockerJavaClient] Added properties for docker response and connection timeout

Author: Alathreon

JShellAPI/src/main/java/org/togetherjava/jshellapi/Config.java

@@ -11,7 +11,9 @@ public record Config(
         long maxAliveSessions,
         int dockerMaxRamMegaBytes,
         double dockerCPUsUsage,
-        long schedulerSessionKillScanRateSeconds) {
+        long schedulerSessionKillScanRateSeconds,
+        long dockerResponseTimeout,
+        long dockerConnectionTimeout) {
     public Config {
         if(regularSessionTimeoutSeconds <= 0) throw new RuntimeException("Invalid value " + regularSessionTimeoutSeconds);
         if(oneTimeSessionTimeoutSeconds <= 0) throw new RuntimeException("Invalid value " + oneTimeSessionTimeoutSeconds);
@@ -21,5 +23,7 @@ public record Config(
         if(dockerMaxRamMegaBytes <= 0) throw new RuntimeException("Invalid value " + dockerMaxRamMegaBytes);
         if(dockerCPUsUsage <= 0) throw new RuntimeException("Invalid value " + dockerCPUsUsage);
         if(schedulerSessionKillScanRateSeconds <= 0) throw new RuntimeException("Invalid value " + schedulerSessionKillScanRateSeconds);
+        if(dockerResponseTimeout <= 0) throw new RuntimeException("Invalid value " + dockerResponseTimeout);
+        if(dockerConnectionTimeout <= 0) throw new RuntimeException("Invalid value " + dockerConnectionTimeout);
     }
 }

JShellAPI/src/main/java/org/togetherjava/jshellapi/service/DockerService.java

@@ -10,7 +10,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.togetherjava.jshellapi.Config;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -24,19 +26,18 @@
 @Service
 public class DockerService implements DisposableBean {
     private static final Logger LOGGER = LoggerFactory.getLogger(DockerService.class);
-
     private static final String WORKER_LABEL = "jshell-api-worker";
     private static final UUID WORKER_UNIQUE_ID = UUID.randomUUID();
 
     private final DockerClient client;
 
-    public DockerService() {
+    public DockerService(Config config) {
         DefaultDockerClientConfig clientConfig = DefaultDockerClientConfig.createDefaultConfigBuilder().build();
         ApacheDockerHttpClient httpClient = new ApacheDockerHttpClient.Builder()
                 .dockerHost(clientConfig.getDockerHost())
                 .sslConfig(clientConfig.getSSLConfig())
-                .responseTimeout(Duration.ofSeconds(60))
-                .connectionTimeout(Duration.ofSeconds(60))
+                .responseTimeout(Duration.ofSeconds(config.dockerResponseTimeout()))
+                .connectionTimeout(Duration.ofSeconds(config.dockerConnectionTimeout()))
                 .build();
         this.client = DockerClientImpl.getInstance(clientConfig, httpClient);
 

JShellAPI/src/main/resources/application.properties

@@ -11,4 +11,8 @@ jshellapi.dockerMaxRamMegaBytes=100
 jshellapi.dockerCPUsUsage=0.5
 
 # Internal config
-jshellapi.schedulerSessionKillScanRateSeconds=60
+jshellapi.schedulerSessionKillScanRateSeconds=60
+
+# Docker service config
+jshellapi.dockerResponseTimeout=60
+jshellapi.dockerConnectionTimeout=60