Merge remote-tracking branch 'origin/a251773307313200_fix_worker_die'

openprocurement · Jan 23, 2017 · 1c97fa9 · 1c97fa9
2 parents 7abaa55 + 7afef8f
commit 1c97fa9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/openprocurement/tender/competitivedialogue/databridge.py b/openprocurement/tender/competitivedialogue/databridge.py
@@ -630,10 +630,15 @@ def get_competitive_dialogue_forward(self):
                             extra=journal_context({"MESSAGE_ID": DATABRIDGE_TENDER_PROCESS},
                                                   {"TENDER_ID": tender_data['id']}))
                 self.competitive_dialogues_queue.put(tender_data)
+        except ResourceError as re:
+            logger.warn('Forward worker died!', extra=journal_context({"MESSAGE_ID": DATABRIDGE_WORKER_DIED}, {}))
+            logger.error("Error response {}".format(re.message))
+            raise re
         except Exception, e:
             # TODO reset queues and restart sync
             logger.warn('Forward worker died!', extra=journal_context({"MESSAGE_ID": DATABRIDGE_WORKER_DIED}, {}))
             logger.exception(e)
+            raise e
         else:
             logger.warn('Forward data sync finished!')  # Should never happen!!!
 
@@ -646,10 +651,15 @@ def get_competitive_dialogue_backward(self):
                             extra=journal_context({"MESSAGE_ID": DATABRIDGE_TENDER_PROCESS},
                                                   {"TENDER_ID": tender_data['id']}))
                 self.competitive_dialogues_queue.put(tender_data)
+        except ResourceError as re:
+            logger.warn('Backward worker died!', extra=journal_context({"MESSAGE_ID": DATABRIDGE_WORKER_DIED}, {}))
+            logger.error("Error response {}".format(re.message))
+            raise re
         except Exception, e:
             # TODO reset queues and restart sync
             logger.warn('Backward worker died!', extra=journal_context({"MESSAGE_ID": DATABRIDGE_WORKER_DIED}, {}))
             logger.exception(e)
+            raise e
         else:
             logger.info('Backward data sync finished.')
 
@@ -683,7 +693,6 @@ def _start_competitive_wokers(self):
             gevent.spawn(self.get_competitive_dialogue_backward),
             gevent.spawn(self.get_competitive_dialogue_forward),
         ]
-        gevent.joinall(self.jobs)
 
     def _restart_synchronization_workers(self):
         logger.warn("Restarting synchronization", extra=journal_context({"MESSAGE_ID": DATABRIDGE_RESTART}, {}))

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '1.0.6'
+version = '1.0.7'
 
 requires = [
     'setuptools'