lib/depengine/provider/cdb.rb in depengine-3.0.3 vs lib/depengine/provider/cdb.rb in depengine-3.0.4

- old
+ new

@@ -82,33 +82,19 @@ Helper.validates_presence_of version Helper.validates_presence_of env Helper.validates_presence_of path begin - if true - begin - cdb_filesystem = Provider::CDB_FILESYSTEM.new - result = JSON.parse(cdb_filesystem.read_data(path)) - #puts result - rescue Exception => e - $log.writer.error "Error: got invalid json from cdb" - $log.writer.error "Request was: #{path.to_s}" - $log.writer.error e.message - exit 1 - end - else - url = protocol + '://' + \ - File.join(host, context, env, path, "showall.json") - begin - result = JSON.parse(Net::HTTP.get(URI.parse(url))) - rescue Exception => e - $log.writer.error "Error: got invalid json from cdb" - $log.writer.error "Request was: #{url.to_s}" - $log.writer.error "Answer was: #{Net::HTTP.get(URI.parse(url))}" - $log.writer.error e.message - exit 1 - end + begin + cdb_filesystem = Provider::CDB_FILESYSTEM.new + result = JSON.parse(cdb_filesystem.read_data(path)) + #puts result + rescue Exception => e + $log.writer.error "Error: got invalid json from cdb" + $log.writer.error "Request was: #{path.to_s}" + $log.writer.error e.message + exit 1 end # decrypt encrypted entries automagically password = "" if ENV['USE_DEPENGINE_AS_GEM']