return empty list if error occurs on hebe (#8240)

This commit is contained in:
Serghei Mihai 2015-12-22 09:55:01 +01:00 committed by Frédéric Péters
parent 4b4970cac3
commit 71aaeb2068
1 changed files with 15 additions and 1 deletions

View File

@ -1,5 +1,7 @@
import urlparse
import requests
import logging
import json
from django.core.urlresolvers import reverse
from django.db import models
@ -32,13 +34,25 @@ class MontpellierSig(BaseResource):
return reverse('montpellier-sig-view', kwargs={'slug': self.slug})
def sig_request(self, endpoint, **kwargs):
logger = logging.getLogger(__name__)
if self.keystore:
kwargs['cert'] = (self.keystore.path, self.keystore.path)
if not self.verify_cert:
kwargs['verify'] = False
if self.username:
kwargs['auth'] = (self.username, self.password)
return requests.get(self.service_url + '/adresse/rest/' + endpoint, **kwargs).json()
resp = requests.get(self.service_url + '/adresse/rest/' + endpoint, **kwargs)
if resp.status_code != 200:
logger.warning('endpoint %r returned(%r): %r', endpoint,
resp.status_code, resp.content)
return []
try:
return json.loads(resp.content)
except:
logger.warning('error occured while trying to read json data from %r: %r', endpoint, e)
return []
@classmethod
def get_add_url(cls):