From 151a60d22eba8255f115a4a1046724f01fb50c08 Mon Sep 17 00:00:00 2001 From: Martijn Dashorst Date: Mon, 28 Nov 2011 08:23:03 +0100 Subject: [PATCH] Update src/main/java/com/heroku/test/Main.java --- src/main/java/com/heroku/test/Main.java | 28 +++++++------------------ 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/heroku/test/Main.java b/src/main/java/com/heroku/test/Main.java index 5965929..90a8549 100644 --- a/src/main/java/com/heroku/test/Main.java +++ b/src/main/java/com/heroku/test/Main.java @@ -12,7 +12,7 @@ import org.eclipse.jetty.webapp.WebAppContext; import com.mongodb.DB; -import com.mongodb.Mongo; +import com.mongodb.MongoURI; /** * @@ -40,27 +40,13 @@ public static void main(String[] args) throws Exception{ Server server = new Server(Integer.valueOf(webPort)); WebAppContext root = new WebAppContext(); - - - - //Parse mango db URL - String mongoDbURL = System.getenv("MONGOHQ_URL"); - - System.out.println("mongo url: " + mongoDbURL); - - Matcher matcher = Pattern.compile("mongodb://(.*):(.*)@(.*):(.*)/(.*)").matcher(mongoDbURL); - matcher.find(); - - String mongoUser = matcher.group(1); - String mongoPassword = matcher.group(2); - String mongoHost = matcher.group(3); - String mongoPort = matcher.group(4); - String mongoDatabase = matcher.group(5); + MongoURI mongoDbURI = new MongoURI(System.getenv("MONGOHQ_URL")); + DB connectedDB = mongoURI.connectDB(); - - Mongo mongo = new Mongo(mongoHost, Integer.valueOf(mongoPort)); - DB db = mongo.getDB(mongoDatabase); - db.authenticate(mongoUser, mongoPassword.toCharArray()); + // allow for localhost, non-authenticated Mongo use + if (mongoURI.getUsername() != null) { + connectedDB.authenticate(mongoURI.getUsername(), mongoURI.getPassword()); + } //Set up session handling through MongoDb MongoSessionIdManager idMgr = new MongoSessionIdManager(server, db.getCollection("sessions"));