From b1cbadb2d1834a720228ab7f73f3a148a10ee576 Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Tue, 1 Jan 2013 19:27:52 -0500
Subject: [PATCH] put async new MongoStore back in

---
 src/server/index.coffee | 67 +++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/server/index.coffee b/src/server/index.coffee
index ffadbfaf99..eb23ef9626 100644
--- a/src/server/index.coffee
+++ b/src/server/index.coffee
@@ -51,41 +51,42 @@ options =
   allowPurl: true
   schema: require('../app/schema').newUserObject()
 
-expressApp
-  .use(express.favicon())
-  # Gzip static files and serve from memory
-  .use(gzippo.staticGzip publicPath, maxAge: ONE_YEAR)
-  # Gzip dynamically rendered content
-  .use(express.compress())
+mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
+  expressApp
+    .use(express.favicon())
+    # Gzip static files and serve from memory
+    .use(gzippo.staticGzip publicPath, maxAge: ONE_YEAR)
+    # Gzip dynamically rendered content
+    .use(express.compress())
 
-  # Uncomment to add form data parsing support
-  .use(express.bodyParser())
-  .use(express.methodOverride())
+    # Uncomment to add form data parsing support
+    .use(express.bodyParser())
+    .use(express.methodOverride())
 
-  # Uncomment and supply secret to add Derby session handling
-  # Derby session middleware creates req.session and socket.io sessions
-  .use(express.cookieParser())
-  .use(store.sessionMiddleware
-    secret: process.env.SESSION_SECRET || 'YOUR SECRET HERE'
-    cookie: {maxAge: ONE_YEAR}
-    store: new MongoStore {url: process.env.NODE_DB_URI}
-  )
+    # Uncomment and supply secret to add Derby session handling
+    # Derby session middleware creates req.session and socket.io sessions
+    .use(express.cookieParser())
+    .use(store.sessionMiddleware
+      secret: process.env.SESSION_SECRET || 'YOUR SECRET HERE'
+      cookie: {maxAge: ONE_YEAR}
+      store: mongo_store
+    )
 
-  # Adds req.getModel method
-  .use(store.modelMiddleware())
-  # Middelware can be inserted after the modelMiddleware and before
-  # the app router to pass server accessible data to a model
-  .use(priv.middleware)
-  .use(habitrpgMiddleware)
-  .use(auth(store, strategies, options))
-  # Creates an express middleware from the app's routes
-  .use(app.router())
-  .use(expressApp.router)
-  .use(serverError root)
+    # Adds req.getModel method
+    .use(store.modelMiddleware())
+    # Middelware can be inserted after the modelMiddleware and before
+    # the app router to pass server accessible data to a model
+    .use(priv.middleware)
+    .use(habitrpgMiddleware)
+    .use(auth(store, strategies, options))
+    # Creates an express middleware from the app's routes
+    .use(app.router())
+    .use(expressApp.router)
+    .use(serverError root)
 
-priv.routes(expressApp)
-require('./serverRoutes')(expressApp, root, derby)
+  priv.routes(expressApp)
+  require('./serverRoutes')(expressApp, root, derby)
 
-# Errors
-expressApp.all '*', (req) ->
-  throw "404: #{req.url}"
\ No newline at end of file
+  # Errors
+  expressApp.all '*', (req) ->
+    throw "404: #{req.url}"
\ No newline at end of file