From eed7d4ff53b6465afcb486ec91c8ee23c6149b65 Mon Sep 17 00:00:00 2001 From: redmitry Date: Fri, 19 Jul 2024 17:24:37 +0200 Subject: [PATCH] rename env variable --- .../beacon/network/config/ConfigurationProperties.java | 6 +++--- .../beacon/network/engine/BeaconNetworkAggregator.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/es/bsc/inb/ga4gh/beacon/network/config/ConfigurationProperties.java b/src/main/java/es/bsc/inb/ga4gh/beacon/network/config/ConfigurationProperties.java index 1f34506..9bf551e 100644 --- a/src/main/java/es/bsc/inb/ga4gh/beacon/network/config/ConfigurationProperties.java +++ b/src/main/java/es/bsc/inb/ga4gh/beacon/network/config/ConfigurationProperties.java @@ -34,18 +34,18 @@ public final class ConfigurationProperties { public final static String BN_CONFIG_DIR_PROPERTY_NAME = "BEACON_NETWORK_CONFIG_DIR"; public final static String BN_REQUEST_TIMEOUT_PROPERTY_NAME = "BEACON_NETWORK_REQUEST_TIMEOUT"; - public final static String BN_CANCEL_REQUEST_TIMEOUT_PROPERTY_NAME = "BEACON_NETWORK_CANCEL_REQUEST_TIMEOUT"; + public final static String BN_DISCARD_REQUEST_TIMEOUT_PROPERTY_NAME = "BEACON_NETWORK_DISCARD_REQUEST_TIMEOUT"; public final static String BN_REFRESH_METADATA_TIMEOUT_PROPERTY_NAME = "BEACON_NETWORK_REFRESH_METADATA_TIMEOUT"; public final static String BN_CONFIG_DIR_PROPERTY; - public final static long BN_CANCEL_REQUEST_TIMEOUT_PROPERTY; + public final static long BN_DISCARD_REQUEST_TIMEOUT_PROPERTY; public final static long BN_REQUEST_TIMEOUT_PROPERTY; public final static long BN_REFRESH_METADATA_TIMEOUT_PROPERTY; static { BN_CONFIG_DIR_PROPERTY = System.getenv(BN_CONFIG_DIR_PROPERTY_NAME); - BN_CANCEL_REQUEST_TIMEOUT_PROPERTY = readProperty(BN_CANCEL_REQUEST_TIMEOUT_PROPERTY_NAME, 5); + BN_DISCARD_REQUEST_TIMEOUT_PROPERTY = readProperty(BN_DISCARD_REQUEST_TIMEOUT_PROPERTY_NAME, 5); BN_REQUEST_TIMEOUT_PROPERTY = readProperty(BN_REQUEST_TIMEOUT_PROPERTY_NAME, 600); BN_REFRESH_METADATA_TIMEOUT_PROPERTY = readProperty(BN_REFRESH_METADATA_TIMEOUT_PROPERTY_NAME, 60); } diff --git a/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkAggregator.java b/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkAggregator.java index b5064fe..5375ad9 100644 --- a/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkAggregator.java +++ b/src/main/java/es/bsc/inb/ga4gh/beacon/network/engine/BeaconNetworkAggregator.java @@ -176,7 +176,7 @@ private List getResultsets( try { final HttpResponse response = - invocation.get(ConfigurationProperties.BN_CANCEL_REQUEST_TIMEOUT_PROPERTY, TimeUnit.SECONDS); + invocation.get(ConfigurationProperties.BN_DISCARD_REQUEST_TIMEOUT_PROPERTY, TimeUnit.SECONDS); if (response != null) { if (response.body() != null) { responses.add(response.body());