remove extractors routing key

Author: max-zilla

pyclowder/connectors.py

@@ -412,14 +412,11 @@ def _process_message(self, body):
             return
 
         # register extractor
-        if clowder_version == 2.0:
-            # TODO: Shouldn't heartbeat handle this?
-            url = "%sapi/v2/extractors" % source_host
-        else:
+        if clowder_version != 2.0:
             url = "%sapi/extractors" % source_host
-        if url not in Connector.registered_clowder:
-            Connector.registered_clowder.append(url)
-            self.register_extractor("%s?key=%s" % (url,secret_key))
+            if url not in Connector.registered_clowder:
+                Connector.registered_clowder.append(url)
+                self.register_extractor("%s?key=%s" % (url,secret_key))
 
         # tell everybody we are starting to process the file
         self.status_update(pyclowder.utils.StatusMessage.start, resource, "Started processing.")
@@ -707,7 +704,7 @@ def connect(self):
 
             self.channel.queue_bind(queue=self.rabbitmq_queue,
                                     exchange=self.rabbitmq_exchange,
-                                    routing_key="extractors." + self.extractor_name)
+                                    routing_key=self.extractor_name)
 
         # start the extractor announcer
         self.announcer = RabbitMQBroadcast(self.rabbitmq_uri, self.extractor_info, self.rabbitmq_queue, self.heartbeat)

pyclowder/datasets.py

@@ -15,11 +15,8 @@
 from pyclowder.collections import get_datasets, get_child_collections, delete as delete_collection
 from pyclowder.utils import StatusMessage
 
-from dotenv import load_dotenv
-load_dotenv()
 clowder_version = float(os.getenv('clowder_version', '1.0'))
 
-
 def create_empty(connector, host, key, datasetname, description, parentid=None, spaceid=None):
     """Create a new dataset in Clowder.