Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

set different http timeouts based on what we are fetching

Browse Source
This commit is contained in:
Athou
2013-06-29 12:05:22 +02:00
parent fd83609d68
commit a425c33cf8
5 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/com/commafeed/backend/HttpGetter.java
View File

@@ -59,9 +59,9 @@ public class HttpGetter {
private static final X509HostnameVerifier VERIFIER = new DefaultHostnameVerifier();
public HttpResult getBinary(String url) throws ClientProtocolException,
public HttpResult getBinary(String url, int timeout) throws ClientProtocolException,
IOException, NotModifiedException {
return getBinary(url, null, null);
return getBinary(url, null, null, timeout);
}
/**
@@ -78,12 +78,12 @@ public class HttpGetter {
* @throws NotModifiedException
* if the url hasn't changed since we asked for it last time
*/
public HttpResult getBinary(String url, String lastModified, String eTag)
public HttpResult getBinary(String url, String lastModified, String eTag, int timeout)
throws ClientProtocolException, IOException, NotModifiedException {
HttpResult result = null;
long start = System.currentTimeMillis();
HttpClient client = newClient();
HttpClient client = newClient(timeout);
try {
HttpGet httpget = new HttpGet(url);
httpget.addHeader(HttpHeaders.ACCEPT_LANGUAGE, "en");
@@ -191,7 +191,7 @@ public class HttpGetter {
}
public static HttpClient newClient() {
public static HttpClient newClient(int timeout) {
DefaultHttpClient client = new SystemDefaultHttpClient();
SSLSocketFactory ssf = new SSLSocketFactory(SSL_CONTEXT, VERIFIER);
@@ -202,8 +202,8 @@ public class HttpGetter {
HttpParams params = client.getParams();
HttpClientParams.setCookiePolicy(params, CookiePolicy.IGNORE_COOKIES);
HttpProtocolParams.setContentCharset(params, "UTF-8");
HttpConnectionParams.setConnectionTimeout(params, 20000);
HttpConnectionParams.setSoTimeout(params, 20000);
HttpConnectionParams.setConnectionTimeout(params, timeout);
HttpConnectionParams.setSoTimeout(params, timeout);
client.setHttpRequestRetryHandler(new DefaultHttpRequestRetryHandler(0,
false));
return new DecompressingHttpClient(client);