diff --git a/apptax/taxonomie/filemanager.py b/apptax/taxonomie/filemanager.py index 6e4402d3..10c0e8ae 100644 --- a/apptax/taxonomie/filemanager.py +++ b/apptax/taxonomie/filemanager.py @@ -231,11 +231,16 @@ def url_to_image(url): """ Récupération d'une image à partir d'une url """ + r = requests.get(url, stream=True) + + if (r.status_code >= 400): + raise Exception("Pb with request : status code {}".format(r.status_code)) try: img = Image.open(io.BytesIO(r.content)) except IOError: raise Exception("Media is not an image") + return img diff --git a/gunicorn_start.sh b/gunicorn_start.sh index f5e50cd7..217342c0 100755 --- a/gunicorn_start.sh +++ b/gunicorn_start.sh @@ -7,6 +7,13 @@ echo "$FLASKDIR" . "$FLASKDIR"/settings.ini +if [ ! -z "$proxy_http" ] || [ ! -z "$proxy_https" ] +then + echo "\$proxy_http is NOT empty" + export HTTP_PROXY="'$proxy_http'" + export HTTPS_PROXY="'$proxy_https'" +fi + # activate the virtualenv cd $FLASKDIR/$venv_dir source bin/activate diff --git a/settings.ini.sample b/settings.ini.sample index 732dc27f..5884fe72 100755 --- a/settings.ini.sample +++ b/settings.ini.sample @@ -66,3 +66,8 @@ insert_taxons_example=true gun_num_workers=4 gun_host=0.0.0.0 gun_port=5000 + +# Proxy - si le serveur sur lequel se trouve Taxhub se trouve derrière un proxy +# laisser vide si vous n'avez pas de proxy +proxy_http= +proxy_https=