From 88a71db9b7e64b4ee379b9cf0327fa614093db64 Mon Sep 17 00:00:00 2001 From: xdanw Date: Thu, 1 Aug 2019 10:28:52 -0500 Subject: [PATCH] Modify timeout for Agent Publish, Deploy to 300s, 120s --- .../buildServer/xldeploy/agent/XldDeployBuildProcess.java | 7 +++++-- .../buildServer/xldeploy/agent/XldPublishBuildProcess.java | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/teamcity-xldeploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldDeployBuildProcess.java b/teamcity-xldeploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldDeployBuildProcess.java index 6577dc1..5ff56e9 100644 --- a/teamcity-xldeploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldDeployBuildProcess.java +++ b/teamcity-xldeploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldDeployBuildProcess.java @@ -43,9 +43,12 @@ public XldDeployBuildProcess(AgentRunningBuild runningBuild, BuildRunnerContext final Map 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/teamcity-xldeploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldPublishBuildProcess.java b/teamcity-xldeploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldPublishBuildProcess.java index e2aa13d..15fec08 100644 --- a/teamcity-xldeploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldPublishBuildProcess.java +++ b/teamcity-xldeploy-agent/src/main/java/jetbrains/buildServer/xldeploy/agent/XldPublishBuildProcess.java @@ -36,9 +36,12 @@ public XldPublishBuildProcess(AgentRunningBuild runningBuild, BuildRunnerContext final Map 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));