Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Adjust the logging around proxy support #44

Merged
merged 1 commit into from
Jan 30, 2018
Merged

Adjust the logging around proxy support #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions esridump/dumper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import requests
import simplejson as json
import socket
import urllib
from six.moves.urllib.parse import urlencode

from esridump import esri2geojson
from esridump.errors import EsriDownloadError
Expand All @@ -28,15 +28,15 @@ def __init__(self, url, parent_logger=None,

def _request(self, method, url, **kwargs):
try:
self._logger.debug("Requesting %s with args %s", url, kwargs.get('params') or kwargs.get('data'))

if self._proxy:
url = self._proxy + url

if kwargs.get('params'):
url += '?' + urllib.urlencode(kwargs.get('params'))
del kwargs['params']
params = kwargs.pop('params', None)
if params:
url += '?' + urlencode(params)

self._logger.debug("%s %s, args %s", method, url, kwargs.get('params') or kwargs.get('data'))
return requests.request(method, url, timeout=self._http_timeout, **kwargs)
except requests.exceptions.SSLError:
self._logger.warning("Retrying %s without SSL verification", url)
Expand Down Expand Up @@ -75,7 +75,8 @@ def _build_headers(self, headers=None):

def _handle_esri_errors(self, response, error_message):
if response.status_code != 200:
raise EsriDownloadError('{}: HTTP {} {}'.format(
raise EsriDownloadError('{}: {} HTTP {} {}'.format(
response.request.url,
error_message,
response.status_code,
response.text,
Expand Down