500 error in clowder2 for posting metadata.

Author: tcnichol

pyclowder/connectors.py

@@ -420,7 +420,7 @@ def _process_message(self, body):
         if url not in Connector.registered_clowder:
             Connector.registered_clowder.append(url)
             if clowder_version >= 2.0:
-                self.register_extractor("%s" % (url,secret_key))
+                self.register_extractor("%s?key=%s" % (url,secret_key))
             else:
                 self.register_extractor("%s?key=%s" % (url, secret_key))
 

pyclowder/files.py

@@ -163,7 +163,7 @@ def upload_metadata(connector, host, key, fileid, metadata, token=None):
     """
 
     if clowder_version >= 2.0:
-        v2files.upload_metadata(connector, host, key, fileid, metadata, token)
+        v2files.upload_metadata(connector, host, key, fileid, metadata)
     else:
         v1files.upload_metadata(connector, host, key, fileid, metadata)