这是indexloc提供的服务，不要输入任何密码
Skip to content
This repository was archived by the owner on Mar 4, 2021. It is now read-only.

Fix httpclient config #145

Merged
merged 2 commits into from
Oct 28, 2014
Merged

Fix httpclient config #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
35a3b5b
Removes deprecated configuration classes for HttpClient library
Oct 28, 2014
5c04896
Changed httpclient and httpcode dependencies to 4.3+
Oct 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ dependencies {
compile 'commons-lang:commons-lang:2.6'
compile 'joda-time:joda-time:2.0'
compile 'com.google.guava:guava:11.+'
compile 'org.apache.httpcomponents:httpclient:4.2.1'
compile 'org.apache.httpcomponents:httpcore:4.2.1'
compile 'org.apache.httpcomponents:httpclient:4.3+'
compile 'org.apache.httpcomponents:httpcore:4.3+'
compile 'org.jclouds.driver:jclouds-jsch:1.6.0'
compile 'org.jclouds.driver:jclouds-slf4j:1.6.0'
compile 'org.jclouds.api:ec2:1.6.0'
Expand Down
20 changes: 10 additions & 10 deletions src/main/java/com/netflix/simianarmy/client/MonkeyRestClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
import org.apache.commons.lang.Validate;
import org.apache.http.HttpResponse;
import org.apache.http.client.HttpClient;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.AutoRetryHttpClient;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.impl.client.DefaultServiceUnavailableRetryStrategy;
import org.apache.http.params.BasicHttpParams;
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
import org.apache.http.impl.client.HttpClientBuilder;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.map.ObjectMapper;
import org.slf4j.Logger;
Expand Down Expand Up @@ -37,11 +34,14 @@ public MonkeyRestClient(int timeout, int maxRetries, int retryInterval) {
Validate.isTrue(timeout >= 0);
Validate.isTrue(maxRetries >= 0);
Validate.isTrue(retryInterval > 0);

HttpParams httpParams = new BasicHttpParams();
HttpConnectionParams.setConnectionTimeout(httpParams, timeout);
httpClient = new AutoRetryHttpClient(new DefaultHttpClient(httpParams),
new DefaultServiceUnavailableRetryStrategy(maxRetries, retryInterval));

RequestConfig config = RequestConfig.custom()
.setConnectTimeout(timeout)
.build();
httpClient = HttpClientBuilder.create()
.setDefaultRequestConfig(config)
.setServiceUnavailableRetryStrategy(new DefaultServiceUnavailableRetryStrategy(maxRetries, retryInterval))
.build();
}

/**
Expand Down