X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f12986389693d4155847204210d9c84492ac6837..b6e28fbe905737bd0ea5bda5f4fd74fd259c58b1:/sdk/cli/bin/arv?ds=sidebyside diff --git a/sdk/cli/bin/arv b/sdk/cli/bin/arv index e84150a35d..337d9abdef 100755 --- a/sdk/cli/bin/arv +++ b/sdk/cli/bin/arv @@ -53,14 +53,16 @@ end class Google::APIClient def discovery_document(api, version) api = api.to_s - return @discovery_documents["#{api}:#{version}"] ||= + discovery_uri = self.discovery_uri(api, version) + discovery_uri_hash = Digest::MD5.hexdigest(discovery_uri) + return @discovery_documents[discovery_uri_hash] ||= begin # fetch new API discovery doc if stale - cached_doc = File.expand_path '~/.cache/arvados/discovery_uri.json' rescue nil + cached_doc = File.expand_path "~/.cache/arvados/discovery-#{discovery_uri_hash}.json" rescue nil if cached_doc.nil? or not File.exist?(cached_doc) or (Time.now - File.mtime(cached_doc)) > 86400 response = self.execute!(:http_method => :get, - :uri => self.discovery_uri(api, version), + :uri => discovery_uri, :authenticated => false) begin