Merge pull request #2 from xebialabs-community/1.3.1-a

Modify timeout for Agent Publish, Deploy to 300s, 120s
xebialabs-community · Aug 2, 2019 · be1a64c · be1a64c
2 parents 3a1c08c + 88a71db
commit be1a64c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...eploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldDeployBuildProcess.java b/...eploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldDeployBuildProcess.java
@@ -43,9 +43,12 @@ public XldDeployBuildProcess(AgentRunningBuild runningBuild, BuildRunnerContext
         final Map<String, String> runnerParameters = context.getRunnerParameters();
 
         logger = runningBuild.getBuildLogger();
-        logger.progressStarted("Progress started for XldDeployBuildProcess");
+        logger.progressStarted("Progress started for XldDeployBuildProcess (120s timeout)");
 
-        client = new OkHttpClient();
+        client = new OkHttpClient.Builder()
+          .readTimeout(120, java.util.concurrent.TimeUnit.SECONDS)
+          .writeTimeout(120, java.util.concurrent.TimeUnit.SECONDS)
+          .build();
 
         host = runnerParameters.get(XldDeployConstants.SETTINGS_XLDDEPLOY_HOST);
         port = Integer.parseInt(runnerParameters.get(XldDeployConstants.SETTINGS_XLDDEPLOY_PORT));

diff --git a/...ploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldPublishBuildProcess.java b/...ploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldPublishBuildProcess.java
@@ -36,9 +36,12 @@ public XldPublishBuildProcess(AgentRunningBuild runningBuild, BuildRunnerContext
         final Map<String, String> runnerParameters = context.getRunnerParameters();
 
         logger = runningBuild.getBuildLogger();
-        logger.progressStarted("Progress started for XldPublishBuildProcess");
+        logger.progressStarted("Progress started for XldPublishBuildProcess (300s timeout)");
 
-        client = new OkHttpClient();
+        client = new OkHttpClient.Builder()
+          .readTimeout(300, java.util.concurrent.TimeUnit.SECONDS)
+          .writeTimeout(300, java.util.concurrent.TimeUnit.SECONDS)
+          .build();
 
         host = runnerParameters.get(XldPublishConstants.SETTINGS_XLDPUBLISH_HOST);
         port = Integer.parseInt(runnerParameters.get(XldPublishConstants.SETTINGS_XLDPUBLISH_PORT));