entrouvert
/
hobo
16
0
Fork 0
Code Issues Pull Requests 16 Releases Activity

misc: give timeout to all health requests (#41703)

This commit is contained in:
Frédéric Péters 2020-04-12 21:08:47 +02:00
parent 4d0fae0293
commit 8a727ac703
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hobo/environment/models.py
View File

@ -120,7 +120,7 @@ class ServiceBase(models.Model):
self.last_operational_check_timestamp = once_now
try:
zone = self.get_admin_zones()[0]
response = requests.get(zone.href, timeout=10, allow_redirects=False)
response = requests.get(zone.href, timeout=5, allow_redirects=False)
response.raise_for_status()
self.last_operational_success_timestamp = once_now
except requests.RequestException:
@ -219,7 +219,7 @@ class ServiceBase(models.Model):
if not self.is_resolvable():
return False
try:
requests.get(self.base_url, verify=True, allow_redirects=False)
requests.get(self.base_url, timeout=5, verify=True, allow_redirects=False)
return True
except requests.exceptions.SSLError:
return False
@ -229,7 +229,7 @@ class ServiceBase(models.Model):
def is_running(self):
if not self.is_resolvable():
return False
r = requests.get(self.get_admin_zones()[0].href, verify=False, allow_redirects=False)
r = requests.get(self.get_admin_zones()[0].href, timeout=5, verify=False, allow_redirects=False)
return (r.status_code >= 200 and r.status_code < 400)
def security_data(self):
@ -240,7 +240,7 @@ class ServiceBase(models.Model):
if not self.is_resolvable():
return security_data
security_data['level'] = 0
resp = requests.get(self.base_url, verify=False, allow_redirects=False)
resp = requests.get(self.base_url, timeout=5, verify=False, allow_redirects=False)
missing_headers = []
for header in ('X-Content-Type-Options', 'X-Frame-Options', 'X-XSS-Protection', 'Strict-Transport-Security'):
if not resp.headers.get(header):