Skip to content

Commit 91ad98a

Browse files
committed
Pass clowder_url into Handler as well
1 parent 3d76de0 commit 91ad98a

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

pyclowder/connectors.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ def on_message(self, channel, method, header, body):
762762
json_body['routing_key'] = method.routing_key
763763

764764
self.worker = RabbitMQHandler(self.extractor_name, self.extractor_info, self.check_message,
765-
self.process_message, self.ssl_verify, self.mounted_paths,
765+
self.process_message, self.ssl_verify, self.mounted_paths, self.clowder_url,
766766
method, header, body)
767767
self.worker.start_thread(json_body)
768768

@@ -837,9 +837,9 @@ class RabbitMQHandler(Connector):
837837
"""
838838

839839
def __init__(self, extractor_name, extractor_info, check_message=None, process_message=None, ssl_verify=True,
840-
mounted_paths=None, method=None, header=None, body=None):
840+
mounted_paths=None, clowder_url=None, method=None, header=None, body=None):
841841
super(RabbitMQHandler, self).__init__(extractor_name, extractor_info, check_message, process_message,
842-
ssl_verify, mounted_paths)
842+
ssl_verify, mounted_paths, clowder_url)
843843
self.method = method
844844
self.header = header
845845
self.body = body

pyclowder/extractors.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ def start(self):
161161
rabbitmq_exchange=self.args.rabbitmq_exchange,
162162
rabbitmq_key=rabbitmq_key,
163163
rabbitmq_queue=self.args.rabbitmq_queuename,
164-
mounted_paths=json.loads(self.args.mounted_paths))
164+
mounted_paths=json.loads(self.args.mounted_paths),
165+
clowder_url=self.args.clowder_url)
165166
rconn.connect()
166167
rconn.register_extractor(self.args.registration_endpoints)
167168
connectors.append(rconn)

0 commit comments

Comments
 (0)