Merge pull request #7 from wowandos26/master

fixed setting custom timeout value (JENKINS-29719)
jenkinsci · Jun 23, 2017 · 76430f5 · 76430f5
2 parents 06bff90 + 9433eae
commit 76430f5
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/graniteclient/GraniteClientExecutor.java b/src/main/java/org/jenkinsci/plugins/graniteclient/GraniteClientExecutor.java
@@ -38,6 +38,7 @@
 import com.cloudbees.plugins.credentials.common.UsernamePasswordCredentials;
 import com.ning.http.client.AsyncCompletionHandler;
 import com.ning.http.client.AsyncHttpClient;
+import com.ning.http.client.AsyncHttpClientConfig;
 import com.ning.http.client.Response;
 import hudson.model.TaskListener;
 import hudson.util.LogTaskListener;
@@ -73,7 +74,14 @@ public static <T> T execute(PackageManagerClientCallable<T> callable, GraniteCli
                                 TaskListener _listener) throws Exception {
         final TaskListener listener = _listener != null ? _listener : DEFAULT_LISTENER;
 
-        final AsyncHttpClient ahcClient = config.getGlobalConfig().getInstance();
+        final GraniteClientGlobalConfig globalConfig = config.getGlobalConfig();
+        final AsyncHttpClient ahcClient = new AsyncHttpClient(new AsyncHttpClientConfig.Builder().setProxyServer(globalConfig.getProxyServer())
+                .setConnectTimeout(globalConfig.getConnectionTimeoutInMs())
+                .setReadTimeout(config.getServiceTimeout() > 0 ? (int) config.getServiceTimeout() : globalConfig.getIdleConnectionTimeoutInMs())
+                .setRequestTimeout(config.getRequestTimeout() > 0 ? (int) config.getRequestTimeout() : globalConfig.getRequestTimeoutInMs())
+                .build()
+        );
+
         try {
             AsyncPackageManagerClient client = new AsyncPackageManagerClient(ahcClient);