Skip to content

Commit 9ea4652

Browse files
committed
add new setting to configure Requests timeout
Signed-off-by: tdruez <tdruez@aboutcode.org>
1 parent b48d3e8 commit 9ea4652

3 files changed

Lines changed: 9 additions & 3 deletions

File tree

dejacode/settings.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -696,6 +696,9 @@ def get_fake_redis_connection(config, use_strict_redis):
696696
# during the Django 6.x release cycle.
697697
URLIZE_ASSUME_HTTPS = env.bool("DEJACODE_URLIZE_ASSUME_HTTPS", default=True)
698698

699+
# Default to 5 seconds.
700+
DEJACODE_INTEGRATION_REQUESTS_TIMEOUT = env.int("DEJACODE_INTEGRATION_REQUESTS_TIMEOUT", default=5)
701+
699702
if IS_TESTS:
700703
# Silent the django-axes logging during tests
701704
LOGGING["loggers"].update({"axes": {"handlers": ["null"]}})

dejacode_toolkit/__init__.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ def get_settings(var_name, default=None):
2121
return getenv(var_name) or getattr(settings, var_name, default)
2222

2323

24+
REQUESTS_TIMEOUT = get_settings("DEJACODE_INTEGRATION_REQUESTS_TIMEOUT", default=5)
25+
26+
2427
def is_service_available(label, session, url, raise_exceptions):
2528
"""Check if a configured integration service is available."""
2629
try:
27-
response = session.head(url, timeout=5)
30+
response = session.head(url, timeout=REQUESTS_TIMEOUT)
2831
response.raise_for_status()
2932
except requests.exceptions.RequestException as request_exception:
3033
logger.debug(f"{label} is_available() error: {request_exception}")
@@ -40,7 +43,7 @@ class BaseService:
4043
settings_prefix = None
4144
url_field_name = None
4245
api_key_field_name = None
43-
default_timeout = 5
46+
default_timeout = REQUESTS_TIMEOUT
4447

4548
def __init__(self, dataspace):
4649
if not dataspace:

dejacode_toolkit/vulnerablecode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ def get_vulnerable_cpes(self, components):
126126
if not cpes:
127127
return []
128128

129-
search_results = self.bulk_search_by_cpes(cpes, timeout=5)
129+
search_results = self.bulk_search_by_cpes(cpes)
130130
if not search_results:
131131
return []
132132

0 commit comments

Comments
 (0)