From bdeaadf33fbcd473f1f1f22c24df32c712d57369 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Wed, 7 Dec 2016 16:37:23 +0100 Subject: [PATCH 1/3] Fix QPS: Compare everything in microseconds #317 --- .../lib/python/cartodb_services/cartodb_services/mapzen/qps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/lib/python/cartodb_services/cartodb_services/mapzen/qps.py b/server/lib/python/cartodb_services/cartodb_services/mapzen/qps.py index 2c7101c..65569fb 100644 --- a/server/lib/python/cartodb_services/cartodb_services/mapzen/qps.py +++ b/server/lib/python/cartodb_services/cartodb_services/mapzen/qps.py @@ -55,7 +55,7 @@ class QPSService: def retry(self, first_request_time, retry_count): elapsed = datetime.now() - first_request_time - if elapsed.microseconds > (self._retry_timeout * 1000.0): + if elapsed.microseconds > (self._retry_timeout * 1000.0 * 1000.0): raise TimeoutException() # inverse qps * (1.5 ^ i) is an increased sleep time of 1.5x per From 7c348dee0f69f493d2ea672514a8970ed55b8856 Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Wed, 7 Dec 2016 16:38:46 +0100 Subject: [PATCH 2/3] Mapzen isochrones: tweak retry params #317 --- .../cartodb_services/cartodb_services/mapzen/isochrones.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/lib/python/cartodb_services/cartodb_services/mapzen/isochrones.py b/server/lib/python/cartodb_services/cartodb_services/mapzen/isochrones.py index dbf2436..3fa72cd 100644 --- a/server/lib/python/cartodb_services/cartodb_services/mapzen/isochrones.py +++ b/server/lib/python/cartodb_services/cartodb_services/mapzen/isochrones.py @@ -13,7 +13,7 @@ class MapzenIsochrones: BASE_URL = 'https://matrix.mapzen.com/isochrone' READ_TIMEOUT = 60 CONNECT_TIMEOUT = 10 - MAX_RETRIES = 3 + MAX_RETRIES = 1 ACCEPTED_MODES = { "walk": "pedestrian", @@ -25,7 +25,7 @@ class MapzenIsochrones: self._url = base_url self._logger = logger - @qps_retry + @qps_retry(qps=7) def isochrone(self, locations, costing, ranges): request_params = self._parse_request_params(locations, costing, ranges) From 98fa248fffe57393de356c9e838dac7b4bcc06cd Mon Sep 17 00:00:00 2001 From: Rafa de la Torre Date: Wed, 7 Dec 2016 16:39:28 +0100 Subject: [PATCH 3/3] New version of the python lib #317 --- server/lib/python/cartodb_services/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/lib/python/cartodb_services/setup.py b/server/lib/python/cartodb_services/setup.py index 38406bf..90b594c 100644 --- a/server/lib/python/cartodb_services/setup.py +++ b/server/lib/python/cartodb_services/setup.py @@ -10,7 +10,7 @@ from setuptools import setup, find_packages setup( name='cartodb_services', - version='0.12.1', + version='0.12.2', description='CartoDB Services API Python Library',