aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2015-09-10 20:58:37 +0200
committerJulien HENRY <julien.henry@sonarsource.com>2015-09-10 20:58:37 +0200
commiteeabf702f9c06d5177f5b8e24b1183e3867063fd (patch)
tree046e79bcd6561e8c9076615711bd51e864139e5f
parenta38181fead52b5b738c10a21a107587a2b7e5783 (diff)
downloadsonarqube-eeabf702f9c06d5177f5b8e24b1183e3867063fd.tar.gz
sonarqube-eeabf702f9c06d5177f5b8e24b1183e3867063fd.zip
Increase read timeout for WSLoader
-rw-r--r--sonar-batch/src/main/java/org/sonar/batch/cache/WSLoader.java28
1 files changed, 14 insertions, 14 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoader.java b/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoader.java
index d6966e97548..06b38f7b607 100644
--- a/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoader.java
+++ b/sonar-batch/src/main/java/org/sonar/batch/cache/WSLoader.java
@@ -19,28 +19,27 @@
*/
package org.sonar.batch.cache;
-import org.sonar.batch.bootstrap.ServerClient;
-import org.sonar.api.utils.log.Logger;
-import org.sonar.api.utils.log.Loggers;
-
-import javax.annotation.Nonnull;
-
-import org.sonar.api.utils.HttpDownloader;
import com.google.common.io.ByteSource;
-import org.apache.commons.io.IOUtils;
-
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
-
-import static org.sonar.batch.cache.WSLoader.ServerStatus.*;
+import javax.annotation.Nonnull;
+import org.apache.commons.io.IOUtils;
+import org.sonar.api.utils.HttpDownloader;
+import org.sonar.api.utils.log.Logger;
+import org.sonar.api.utils.log.Loggers;
+import org.sonar.batch.bootstrap.ServerClient;
import org.sonar.home.cache.PersistentCache;
+import static org.sonar.batch.cache.WSLoader.ServerStatus.ACCESSIBLE;
+import static org.sonar.batch.cache.WSLoader.ServerStatus.NOT_ACCESSIBLE;
+import static org.sonar.batch.cache.WSLoader.ServerStatus.UNKNOWN;
+
public class WSLoader {
private static final Logger LOG = Loggers.get(WSLoader.class);
private static final String FAIL_MSG = "Server is not accessible and data is not cached";
- private static final int CONNECT_TIMEOUT = 5000;
- private static final int READ_TIMEOUT = 10000;
+ private static final int CONNECT_TIMEOUT = 5_000;
+ private static final int READ_TIMEOUT = 600_000;
private static final String REQUEST_METHOD = "GET";
public enum ServerStatus {
@@ -73,6 +72,7 @@ public class WSLoader {
public WSLoaderResult<String> loadString(String id) {
return loadString(id, defautLoadStrategy);
}
+
@Nonnull
public WSLoaderResult<String> loadString(String id, WSLoader.LoadStrategy strategy) {
WSLoaderResult<byte[]> byteResult = load(id, strategy);
@@ -83,7 +83,7 @@ public class WSLoader {
public WSLoaderResult<byte[]> load(String id) {
return load(id, defautLoadStrategy);
}
-
+
@Nonnull
public WSLoaderResult<byte[]> load(String id, WSLoader.LoadStrategy strategy) {
switch (strategy) {