Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-09-18 17:51:01 +02:00
Code Issues Projects Releases Wiki Activity

Attempt to fix #680 with connection timeouts

Browse Source
This commit is contained in:
Rsl1122 2018-08-10 09:18:42 +03:00
parent bc79d72fea
commit b96efc7f92
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Plan/src/main/java/com/djrapitops/plan/system/info/connection/ConnectionOut.java
View File

@ -10,6 +10,7 @@ import com.djrapitops.plan.system.info.request.InfoRequestWithVariables;
import com.djrapitops.plan.system.info.server.Server; import com.djrapitops.plan.system.info.server.Server;
import com.djrapitops.plan.system.settings.Settings; import com.djrapitops.plan.system.settings.Settings;
import com.djrapitops.plan.utilities.MiscUtils; import com.djrapitops.plan.utilities.MiscUtils;
import com.djrapitops.plugin.api.TimeAmount;
import com.djrapitops.plugin.api.utility.log.Log; import com.djrapitops.plugin.api.utility.log.Log;
import com.djrapitops.plugin.utilities.Verify; import com.djrapitops.plugin.utilities.Verify;
import org.apache.http.client.config.RequestConfig; import org.apache.http.client.config.RequestConfig;
@ -29,6 +30,7 @@ import java.security.KeyManagementException;
import java.security.KeyStoreException; import java.security.KeyStoreException;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.util.Map; import java.util.Map;
import java.util.Properties;
import java.util.UUID; import java.util.UUID;
/** /**
@ -42,6 +44,17 @@ public class ConnectionOut {
private final UUID serverUUID; private final UUID serverUUID;
private final InfoRequest infoRequest; private final InfoRequest infoRequest;
static {
try {
Properties properties = System.getProperties();
properties.setProperty("sun.net.client.defaultConnectTimeout", Long.toString(TimeAmount.MINUTE.ms()));
properties.setProperty("sun.net.client.defaultReadTimeout", Long.toString(TimeAmount.MINUTE.ms()));
properties.setProperty("sun.net.http.retryPost", Boolean.toString(false));
} catch (Exception e) {
e.printStackTrace();
}
}
/** /**
* Constructor. * Constructor.
* *
@ -118,10 +131,12 @@ public class ConnectionOut {
private void prepareRequest(HttpPost post, String parameters) { private void prepareRequest(HttpPost post, String parameters) {
RequestConfig requestConfig = RequestConfig.custom() RequestConfig requestConfig = RequestConfig.custom()
.setConnectionRequestTimeout(10000) .setConnectionRequestTimeout(5000)
.setSocketTimeout(10000)
.setConnectTimeout(9000)
.setRedirectsEnabled(true)
.setRelativeRedirectsAllowed(true) .setRelativeRedirectsAllowed(true)
.setContentCompressionEnabled(true) .setContentCompressionEnabled(true)
.setMaxRedirects(1)
.build(); .build();
post.setConfig(requestConfig); post.setConfig(requestConfig);