dsw-command-queue 4.1.0__tar.gz → 4.2.0__tar.gz

{dsw-command-queue-4.1.0 → dsw-command-queue-4.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsw-command-queue
-Version: 4.1.0
+Version: 4.2.0
 Summary: Library for working with command queue and persistent commands
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -19,7 +19,7 @@ Classifier: Topic :: Utilities
 Requires-Python: <4,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dsw-database==4.1.0
+Requires-Dist: dsw-database==4.2.0
 
 # Data Stewardship Wizard: Command Queue
 

{dsw-command-queue-4.1.0 → dsw-command-queue-4.2.0}/dsw/command_queue/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.1.0~6647324',
-    built_at='2023-12-05 17:40:44Z',
-    sha='6647324f52d8be83435ceba1cd98111ae5e814bf',
+    version='v4.2.0~0fd7b7f',
+    built_at='2024-01-02 07:46:04Z',
+    sha='0fd7b7f97f993e4e0f3ca92869a3c07f2286d95c',
     branch='HEAD',
-    tag='v4.1.0',
+    tag='v4.2.0',
 )

{dsw-command-queue-4.1.0 → dsw-command-queue-4.2.0}/dsw/command_queue/command_queue.py

@@ -4,6 +4,8 @@ import logging
 import os
 import platform
 import psycopg
+import psycopg.generators
+import select
 import signal
 import tenacity
 
@@ -50,13 +52,14 @@ class CommandWorker:
 class CommandQueue:
 
     def __init__(self, worker: CommandWorker, db: Database,
-                 channel: str, component: str):
+                 channel: str, component: str, timeout: float):
         self.worker = worker
         self.db = db
         self.queries = CommandQueries(
             channel=channel,
             component=component
         )
+        self.timeout = timeout
 
     @tenacity.retry(
         reraise=True,
@@ -76,19 +79,29 @@ class CommandQueue:
         )
         queue_conn.listening = True
         LOG.info('Listening for jobs in command queue')
-        running = True
-        while running:
-            queue_notifications = queue_conn.connection.notifies()
-            LOG.info('Entering working cycle, waiting for notifications')
-            for notification in queue_notifications:
-                LOG.info(f'Notification received: {notification}')
-                while self.accept_notification(payload=notification):
-                    pass
-
-                if INTERRUPTED:
-                    LOG.debug('Interrupt signal received, ending...')
-                    queue_notifications.close()
-                    running = False
+        fds = [queue_conn.connection.pgconn.socket]
+        if IS_LINUX:
+            fds.append(_QUEUE_PIPE_R)
+        LOG.info('Entering working cycle, waiting for notifications')
+        while True:
+            res = True
+            while res:
+                res = self.fetch_and_process()
+            w = select.select(fds, [], [], self.timeout)
+
+            if INTERRUPTED:
+                LOG.debug('Interrupt signal received, ending...')
+                break
+
+            if w == ([], [], []):
+                LOG.debug(f'Nothing received in this cycle '
+                          f'(timeouted after {self.timeout} seconds).')
+            else:
+                notifications = 0
+                for n in psycopg.generators.notifies(queue_conn.connection.pgconn):
+                    notifications += 1
+                    LOG.debug(str(n))
+                LOG.info(f'Notifications received ({notifications})')
         LOG.debug('Exiting command queue')
 
     def accept_notification(self, payload: psycopg.Notify) -> bool:

{dsw-command-queue-4.1.0 → dsw-command-queue-4.2.0}/dsw_command_queue.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsw-command-queue
-Version: 4.1.0
+Version: 4.2.0
 Summary: Library for working with command queue and persistent commands
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -19,7 +19,7 @@ Classifier: Topic :: Utilities
 Requires-Python: <4,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dsw-database==4.1.0
+Requires-Dist: dsw-database==4.2.0
 
 # Data Stewardship Wizard: Command Queue
 

dsw-command-queue-4.2.0/dsw_command_queue.egg-info/requires.txt

@@ -0,0 +1 @@
+dsw-database==4.2.0

{dsw-command-queue-4.1.0 → dsw-command-queue-4.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-command-queue'
-version = "4.1.0"
+version = "4.2.0"
 description = 'Library for working with command queue and persistent commands'
 readme = 'README.md'
 keywords = ['dsw', 'subscriber', 'publisher', 'database', 'queue', 'processing']
@@ -25,7 +25,7 @@ classifiers = [
 requires-python = '>=3.10, <4'
 dependencies = [
     # DSW
-    "dsw-database==4.1.0",
+    "dsw-database==4.2.0",
 ]
 
 [project.urls]

dsw-command-queue-4.1.0/dsw_command_queue.egg-info/requires.txt

@@ -1 +0,0 @@
-dsw-database==4.1.0