From 579b21fb58e37e08ed4db7bb93bb32857b9721c4 Mon Sep 17 00:00:00 2001 From: Ryan Grenz Date: Wed, 5 Jun 2013 12:04:59 +0200 Subject: [PATCH] Update app.rb Fixed mongodb connection environment variable hook --- todo-sinatra/app.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/todo-sinatra/app.rb b/todo-sinatra/app.rb index e1f0749..677eed8 100644 --- a/todo-sinatra/app.rb +++ b/todo-sinatra/app.rb @@ -2,14 +2,17 @@ require 'sinatra' require 'mongo' require 'mongoid' +require 'json' require File.dirname(__FILE__) + '/resource' # MongoDB configuration Mongoid.configure do |config| - if ENV['MONGOHQ_URL'] - conn = Mongo::Connection.from_uri(ENV['MONGOHQ_URL']) - uri = URI.parse(ENV['MONGOHQ_URL']) + if ENV['VCAP_SERVICES'] + vcap_config = JSON.parse(ENV['VCAP_SERVICES']) + mongo_url = vcap_config['mongodb-2.2'][0]['credentials']['url'] + conn = Mongo::Connection.from_uri(mongo_url) + uri = URI.parse(mongo_url) config.master = conn.db(uri.path.gsub(/^\//, '')) else config.master = Mongo::Connection.from_uri("mongodb://localhost:27017").db('test') @@ -36,4 +39,3 @@ class Root < Sinatra::Base end end -