misc: use requests instead of urlopen to check services (#20096)
This commit is contained in:
parent
67514efa64
commit
2589c13f46
|
@ -1,7 +1,7 @@
|
|||
import datetime
|
||||
import urllib2
|
||||
import json
|
||||
import ssl
|
||||
|
||||
import requests
|
||||
|
||||
from django.conf import settings
|
||||
from django.db import models
|
||||
|
@ -77,10 +77,10 @@ class ServiceBase(models.Model):
|
|||
self.last_operational_check_timestamp = once_now
|
||||
try:
|
||||
zone = self.get_admin_zones()[0]
|
||||
fd = urllib2.urlopen(zone.href, timeout=10)
|
||||
fd.close()
|
||||
response = requests.get(zone.href, timeout=10)
|
||||
response.raise_for_status()
|
||||
self.last_operational_success_timestamp = once_now
|
||||
except (urllib2.URLError, urllib2.HTTPError, ssl.SSLError), e:
|
||||
except requests.RequestException as e:
|
||||
pass
|
||||
self.save(update_fields=('last_operational_check_timestamp', 'last_operational_success_timestamp'))
|
||||
|
||||
|
|
Loading…
Reference in New Issue