Merge remote-tracking branch 'origin/a200308578426382_reinitialize_cl…

…ients_on_restart'

openprocurement/contracting/api/databridge.py

@@ -115,42 +115,44 @@ def __init__(self, config):
         self.full_stack_sync_delay = self.config_get('full_stack_sync_delay') or 15
         self.empty_stack_sync_delay = self.config_get('empty_stack_sync_delay') or 101
 
-        api_server = self.config_get('tenders_api_server')
-        api_version = self.config_get('tenders_api_version')
-        ro_api_server = self.config_get('public_tenders_api_server') or api_server
+        self.api_server = self.config_get('tenders_api_server')
+        self.api_version = self.config_get('tenders_api_version')
+        self.ro_api_server = self.config_get('public_tenders_api_server') or self.api_server
 
-        contracting_api_server = self.config_get('contracting_api_server')
-        contracting_api_version = self.config_get('contracting_api_version')
+        self.contracting_api_server = self.config_get('contracting_api_server')
+        self.contracting_api_version = self.config_get('contracting_api_version')
 
-        self.tenders_sync_client = TendersClientSync('',
-            host_url=ro_api_server, api_version=api_version,
-        )
+        self.clients_initialize()
+
+        self.initial_sync_point = {}
+        self.initialization_event = gevent.event.Event()
+        self.tenders_queue = Queue(maxsize=queue_size)
+        self.handicap_contracts_queue = Queue(maxsize=queue_size)
+        self.contracts_put_queue = Queue(maxsize=queue_size)
+        self.contracts_retry_put_queue = Queue(maxsize=queue_size)
+        self.basket = {}
 
+    def clients_initialize(self):
         self.client = TendersClient(
             self.config_get('api_token'),
-            host_url=api_server, api_version=api_version,
+            host_url=self.api_server, api_version=self.api_version,
         )
 
         self.contracting_client = ContractingClient(
             self.config_get('api_token'),
-            host_url=contracting_api_server, api_version=contracting_api_version
+            host_url=self.contracting_api_server, api_version=self.contracting_api_version
         )
 
         self.contracting_client_ro = self.contracting_client
         if self.config_get('public_tenders_api_server'):
-            if api_server == contracting_api_server and api_version == contracting_api_version:
+            if self.api_server == self.contracting_api_server and self.api_version == self.contracting_api_version:
                 self.contracting_client_ro = ContractingClient(
                     self.config_get('api_token'),
-                    host_url=ro_api_server, api_version=api_version
+                    host_url=self.ro_api_server, api_version=self.api_version
                 )
-
-        self.initial_sync_point = {}
-        self.initialization_event = gevent.event.Event()
-        self.tenders_queue = Queue(maxsize=queue_size)
-        self.handicap_contracts_queue = Queue(maxsize=queue_size)
-        self.contracts_put_queue = Queue(maxsize=queue_size)
-        self.contracts_retry_put_queue = Queue(maxsize=queue_size)
-        self.basket = {}
+        self.tenders_sync_client = TendersClientSync('',
+            host_url=self.ro_api_server, api_version=self.api_version,
+        )
 
     def config_get(self, name):
         return self.config.get('main').get(name)
@@ -484,6 +486,7 @@ def _restart_synchronization_workers(self):
         logger.warn("Restarting synchronization", extra=journal_context({"MESSAGE_ID": DATABRIDGE_RESTART}, {}))
         for j in self.jobs:
             j.kill()
+        self.clients_initialize()
         self._start_synchronization_workers()
 
     def _start_contract_sculptors(self):