From 4c5b96225f2286ed29d9c8eec16c167f8dc8ce64 Mon Sep 17 00:00:00 2001 From: mikedarcy Date: Wed, 25 Nov 2020 13:21:32 -0800 Subject: [PATCH] Allow a specific amqp server argument to be specified at construction of PollingEmrestCatalog. Falls back to same server as the specified catalog server. Bump version. --- deriva/core/__init__.py | 2 +- deriva/core/polling_ermrest_catalog.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deriva/core/__init__.py b/deriva/core/__init__.py index e54f18b2..89f4f737 100644 --- a/deriva/core/__init__.py +++ b/deriva/core/__init__.py @@ -1,4 +1,4 @@ -__version__ = "1.4.0" +__version__ = "1.4.1" from deriva.core.utils.core_utils import * from deriva.core.base_cli import BaseCLI, KeyValuePairArgs diff --git a/deriva/core/polling_ermrest_catalog.py b/deriva/core/polling_ermrest_catalog.py index 53cd34ee..178133d1 100644 --- a/deriva/core/polling_ermrest_catalog.py +++ b/deriva/core/polling_ermrest_catalog.py @@ -46,7 +46,7 @@ def look_for_work(): """ - def __init__(self, scheme, server, catalog_id, credentials={}, caching=True, session_config=None): + def __init__(self, scheme, server, catalog_id, credentials={}, caching=True, session_config=None, amqp_server=None): """Create ERMrest catalog binding. Arguments: @@ -58,7 +58,7 @@ def __init__(self, scheme, server, catalog_id, credentials={}, caching=True, ses """ ErmrestCatalog.__init__(self, scheme, server, catalog_id, credentials, caching, session_config) - self.amqp_server = server + self.amqp_server = amqp_server if amqp_server else server self.amqp_connection = None self.notice_exchange = "ermrest_changes"