Skip to content

Commit 6f9f9b8

Browse files
committed
read extractor_info['name']
1 parent fe88e36 commit 6f9f9b8

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
1212
### Fixed
1313
- Acks were not always send due to racing condition
1414
[CATS-886](https://opensource.ncsa.illinois.edu/jira/browse/CATS-886)
15+
- Queue name was not set from extractor_info.json
16+
[CATS-896](https://opensource.ncsa.illinois.edu/jira/browse/CATS-896)
1517

1618
## 2.0.3 - 2018-04-18
1719

pyclowder/extractors.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ def __init__(self):
5757
# read values from environment variables, otherwise use defaults
5858
# this is the specific setup for the extractor
5959
# use RABBITMQ_QUEUE env to overwrite extractor's queue name
60-
self.extractor_info['name'] = os.getenv('RABBITMQ_QUEUE', self.extractor_info['name'])
61-
rabbitmq_queuename = self.extractor_info['name']
60+
rabbitmq_queuename = os.getenv('RABBITMQ_QUEUE')
61+
if not rabbitmq_queuename:
62+
rabbitmq_queuename = self.extractor_info['name']
6263
rabbitmq_uri = os.getenv('RABBITMQ_URI', "amqp://guest:[email protected]/%2f")
6364
rabbitmq_exchange = os.getenv('RABBITMQ_EXCHANGE', "clowder")
6465
registration_endpoints = os.getenv('REGISTRATION_ENDPOINTS', "")

0 commit comments

Comments
 (0)