From cab121224b7d3fd1def3990d4372f751b415b2a2 Mon Sep 17 00:00:00 2001 From: Etienne Loupias Date: Wed, 26 Jun 2019 11:39:43 +0200 Subject: [PATCH] add timeout --- grandlyon_elyx/models.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/grandlyon_elyx/models.py b/grandlyon_elyx/models.py index 1f648dd..c50dd55 100644 --- a/grandlyon_elyx/models.py +++ b/grandlyon_elyx/models.py @@ -59,7 +59,7 @@ class GrandlyonElyx(BaseResource): if resp.status_code == 401: # ask for a new token, and retry request.headers['Authorization'] = self.get_token(renew=True) - resp = self.instance.requests.get(request.url, data=request.data, + resp = self.requests.get(request.url, data=request.data, headers=request.headers, verify=self.verify_cert) return resp @@ -68,13 +68,15 @@ class GrandlyonElyx(BaseResource): request.headers['Authorization'] = self.get_token() resp = self.requests.post(request.url, data=request.data, headers=request.headers, - verify=self.verify_cert) + verify=self.verify_cert, + timeout=60) if resp.status_code == 401: # ask for a new token, and retry request.headers['Authorization'] = self.get_token(renew=True) resp = self.requests.post(request.url, data=request.data, headers=request.headers, - verify=self.verify_cert) + verify=self.verify_cert, + timeout=60) return resp def none_to_str(self, input): @@ -102,7 +104,7 @@ class GrandlyonElyx(BaseResource): # Par defaut si user non connecte user_email = 'gnm@grandlyon.com' - if 'user_email' in formdata.values: + if 'user_email' in formdata.values and formdata.values['user_email'] is not None: user_email = formdata.values['user_email'] #print >> open('/home/grandlyon/log/elyx.debug', 'a+'), datetime.datetime.now(), "user_email:", user_email @@ -115,8 +117,6 @@ class GrandlyonElyx(BaseResource): send_request.data += u'"CIVILITE":"'+self.none_to_str(formdata.values['civilite_code'])+'","NOM":"'+self.none_to_str(formdata.values['nom'])+'","PRENOM":"'+self.none_to_str(formdata.values['prenom'])+'","ADRESSE":"'+self.none_to_str(formdata.values['numero_voie'])+' '+self.none_to_str(formdata.values['voie'])+'","BP":"'+self.none_to_str(formdata.values['boite_postale']) send_request.data += u'","CP":"'+self.none_to_str(formdata.values['code_postal'])+'","VILLE":"'+self.none_to_str(formdata.values['commune'])+'",' send_request.data += u'"REFERENCE":"'+self.none_to_str(formdata.values['reference'])+'","CLASSE_OBJETS":"ICPARCEL","LISTE_PARCELLES":"'+liste_parcelles+'","MAIL_DEMANDEUR":"'+user_email+'",' - if formdata.values['type_de_demande'] == 'CA': - send_request.data += u'"TYPE_CERTIF":"ATTESTATION",' if formdata.values['type_de_demande'] == 'RU': send_request.data += u'"PLAN":true,' send_request.data += u'"MODE_SYNTHETIQUE":true,'