cartodb4/dataservices-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix bug in retries usage; mantain behaviour

Browse Source 
The number of retries was being passed as the pool size parameter.
This is corrected but number of retries changed to 1 to maintain previous behaviour.
This commit is contained in:
Javier Goizueta 2016-12-13 10:07:10 +01:00
parent 2953fda75c
commit 79fb796180
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/lib/python/cartodb_services/cartodb_services/here/geocoder.py
View File

@ -18,7 +18,7 @@ class HereMapsGeocoder(Traceable):
DEFAULT_GEN = 9 DEFAULT_GEN = 9
READ_TIMEOUT = 60 READ_TIMEOUT = 60
CONNECT_TIMEOUT = 10 CONNECT_TIMEOUT = 10
MAX_RETRIES=3 MAX_RETRIES=0
ADDRESS_PARAMS = [ ADDRESS_PARAMS = [
'city', 'city',
@ -92,7 +92,7 @@ class HereMapsGeocoder(Traceable):
request_params.update(params) request_params.update(params)
# TODO Extract HTTP client wrapper # TODO Extract HTTP client wrapper
session = requests.Session() session = requests.Session()
session.mount(self.host, HTTPAdapter(self.MAX_RETRIES)) session.mount(self.host, HTTPAdapter(max_retries=self.MAX_RETRIES))
response = session.get(self.host, params=request_params, response = session.get(self.host, params=request_params,
timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT)) timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT))
self.add_response_data(response, self._logger) self.add_response_data(response, self._logger)

4
server/lib/python/cartodb_services/cartodb_services/here/routing.py
View File

@ -14,7 +14,7 @@ class HereMapsRoutingIsoline(Traceable):
ISOLINE_PATH = '/routing/7.2/calculateisoline.json' ISOLINE_PATH = '/routing/7.2/calculateisoline.json'
READ_TIMEOUT = 60 READ_TIMEOUT = 60
CONNECT_TIMEOUT = 10 CONNECT_TIMEOUT = 10
MAX_RETRIES = 3 MAX_RETRIES = 0
ACCEPTED_MODES = { ACCEPTED_MODES = {
"walk": "pedestrian", "walk": "pedestrian",
@ -57,7 +57,7 @@ class HereMapsRoutingIsoline(Traceable):
parsed_options) parsed_options)
# TODO Extract HTTP client wrapper # TODO Extract HTTP client wrapper
session = requests.Session() session = requests.Session()
session.mount(self._url, HTTPAdapter(self.MAX_RETRIES)) session.mount(self._url, HTTPAdapter(max_retries=self.MAX_RETRIES))
response = requests.get(self._url, params=request_params, response = requests.get(self._url, params=request_params,
timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT)) timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT))
self.add_response_data(response, self._logger) self.add_response_data(response, self._logger)

4
server/lib/python/cartodb_services/cartodb_services/mapzen/geocoder.py
View File

@ -15,7 +15,7 @@ class MapzenGeocoder(Traceable):
BASE_URL = 'https://search.mapzen.com/v1/search' BASE_URL = 'https://search.mapzen.com/v1/search'
READ_TIMEOUT = 60 READ_TIMEOUT = 60
CONNECT_TIMEOUT = 10 CONNECT_TIMEOUT = 10
MAX_RETRIES = 3 MAX_RETRIES = 0
def __init__(self, app_key, logger, base_url=BASE_URL): def __init__(self, app_key, logger, base_url=BASE_URL):
self._app_key = app_key self._app_key = app_key
@ -31,7 +31,7 @@ class MapzenGeocoder(Traceable):
try: try:
# TODO Extract HTTP client wrapper # TODO Extract HTTP client wrapper
session = requests.Session() session = requests.Session()
session.mount(self._url, HTTPAdapter(self.MAX_RETRIES)) session.mount(self._url, HTTPAdapter(max_retries=self.MAX_RETRIES))
response = session.get(self._url, params=request_params, response = session.get(self._url, params=request_params,
timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT)) timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT))
self.add_response_data(response, self._logger) self.add_response_data(response, self._logger)

4
server/lib/python/cartodb_services/cartodb_services/mapzen/isochrones.py
View File

@ -13,7 +13,7 @@ class MapzenIsochrones:
BASE_URL = 'https://matrix.mapzen.com/isochrone' BASE_URL = 'https://matrix.mapzen.com/isochrone'
READ_TIMEOUT = 60 READ_TIMEOUT = 60
CONNECT_TIMEOUT = 10 CONNECT_TIMEOUT = 10
MAX_RETRIES = 3 MAX_RETRIES = 0
ACCEPTED_MODES = { ACCEPTED_MODES = {
"walk": "pedestrian", "walk": "pedestrian",
@ -32,7 +32,7 @@ class MapzenIsochrones:
try: try:
# TODO Extract HTTP client wrapper # TODO Extract HTTP client wrapper
session = requests.Session() session = requests.Session()
session.mount(self._url, HTTPAdapter(self.MAX_RETRIES)) session.mount(self._url, HTTPAdapter(max_retries=self.MAX_RETRIES))
response = session.get(self._url, params=request_params, response = session.get(self._url, params=request_params,
timeout=(self.CONNECT_TIMEOUT, timeout=(self.CONNECT_TIMEOUT,
self.READ_TIMEOUT)) self.READ_TIMEOUT))

4
server/lib/python/cartodb_services/cartodb_services/mapzen/routing.py
View File

@ -15,7 +15,7 @@ class MapzenRouting(Traceable):
PRODUCTION_ROUTING_BASE_URL = 'https://valhalla.mapzen.com/route' PRODUCTION_ROUTING_BASE_URL = 'https://valhalla.mapzen.com/route'
READ_TIMEOUT = 60 READ_TIMEOUT = 60
CONNECT_TIMEOUT = 10 CONNECT_TIMEOUT = 10
MAX_RETRIES=3 MAX_RETRIES=0
ACCEPTED_MODES = { ACCEPTED_MODES = {
"walk": "pedestrian", "walk": "pedestrian",
@ -50,7 +50,7 @@ class MapzenRouting(Traceable):
request_params = self.__parse_request_parameters(json_request_params) request_params = self.__parse_request_parameters(json_request_params)
# TODO Extract HTTP client wrapper # TODO Extract HTTP client wrapper
session = requests.Session() session = requests.Session()
session.mount(self._url, HTTPAdapter(self.MAX_RETRIES)) session.mount(self._url, HTTPAdapter(max_retries=self.MAX_RETRIES))
response = session.get(self._url, params=request_params, response = session.get(self._url, params=request_params,
timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT)) timeout=(self.CONNECT_TIMEOUT, self.READ_TIMEOUT))
self.add_response_data(response, self._logger) self.add_response_data(response, self._logger)