From af847e79c9b0452026a9675908e469286893590f Mon Sep 17 00:00:00 2001 From: Taras Kozlovskyi Date: Mon, 14 Jan 2019 13:14:19 +0200 Subject: [PATCH 1/2] Retrievers parameters based on DEFAULT_RETRIEVERS_PARAMS --- openprocurement_client/resources/sync.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/openprocurement_client/resources/sync.py b/openprocurement_client/resources/sync.py index 269e691..ac48be3 100644 --- a/openprocurement_client/resources/sync.py +++ b/openprocurement_client/resources/sync.py @@ -9,7 +9,7 @@ from openprocurement_client.clients import APIResourceClientSync from openprocurement_client.utils import get_response - +from copy import deepcopy DEFAULT_RETRIEVERS_PARAMS = { 'down_requests_sleep': 5, @@ -36,7 +36,7 @@ class ResourceFeeder(object): def __init__(self, host=DEFAULT_API_HOST, version=DEFAULT_API_VERSION, key=DEFAULT_API_KEY, resource='tenders', extra_params=DEFAULT_API_EXTRA_PARAMS, - retrievers_params=DEFAULT_RETRIEVERS_PARAMS, adaptive=False, + retrievers_params={}, adaptive=False, with_priority=False): super(ResourceFeeder, self).__init__() LOGGER.info('Init Resource Feeder...') @@ -47,7 +47,8 @@ def __init__(self, host=DEFAULT_API_HOST, version=DEFAULT_API_VERSION, self.adaptive = adaptive self.extra_params = extra_params - self.retrievers_params = retrievers_params + self.retrievers_params = deepcopy(DEFAULT_RETRIEVERS_PARAMS) + self.retrievers_params.update(retrievers_params) self.queue = PriorityQueue(maxsize=retrievers_params['queue_size']) self.forward_priority = 1 if with_priority else 0 From fba34ccaf6a35518bce7aaa6519211853b9cc6a9 Mon Sep 17 00:00:00 2001 From: Taras Kozlovskyi Date: Mon, 14 Jan 2019 13:25:37 +0200 Subject: [PATCH 2/2] Typo fix --- openprocurement_client/resources/sync.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openprocurement_client/resources/sync.py b/openprocurement_client/resources/sync.py index ac48be3..5f9598c 100644 --- a/openprocurement_client/resources/sync.py +++ b/openprocurement_client/resources/sync.py @@ -49,7 +49,7 @@ def __init__(self, host=DEFAULT_API_HOST, version=DEFAULT_API_VERSION, self.extra_params = extra_params self.retrievers_params = deepcopy(DEFAULT_RETRIEVERS_PARAMS) self.retrievers_params.update(retrievers_params) - self.queue = PriorityQueue(maxsize=retrievers_params['queue_size']) + self.queue = PriorityQueue(maxsize=self.retrievers_params['queue_size']) self.forward_priority = 1 if with_priority else 0 self.backward_priority = 1000 if with_priority else 0