Commit f42f5bc8 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '1163-cache-data-not-working-for-search-hints' into 'master'

timeouts for dapi are tripled (the service is slow for now)

Closes #1163

See merge request !1154
parents 90c9a572 01e2f952
Pipeline #27616 passed with stage
in 12 minutes and 45 seconds
......@@ -57,7 +57,7 @@ minerva (15.0.0~beta.4) unstable; urgency=medium
* Bug fix: when caching the data on project upload list hint list for mirna,
drugs, chemicals were not cached (#1163)
-- Piotr Gawron <piotr.gawron@uni.lu> Tue, 12 May 2020 15:00:00 +0200
-- Piotr Gawron <piotr.gawron@uni.lu> Tue, 2 Jun 2020 16:00:00 +0200
minerva (15.0.0~beta.3) unstable; urgency=medium
* Improvement: API allows to merge files (#1208)
......
......@@ -143,7 +143,13 @@ public class WebPageDownloader {
Future<String> future = executor.submit(new Task());
try {
String result = future.get(HTTP_CONNECTION_TIMEOUT_SEC, TimeUnit.SECONDS);
int timeout = HTTP_CONNECTION_TIMEOUT_SEC;
// dapi is slow for now - double timout
if (accessUrl.indexOf("dapi.lcsb.uni.lu") >= 0) {
timeout *= 3;
}
String result = future.get(timeout, TimeUnit.SECONDS);
executor.shutdownNow();
return result;
} catch (Exception e) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment