From e49877190e6b0fab6d23e5aa20108d108e4f8658 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Mon, 9 Jul 2012 16:23:09 -0400 Subject: [PATCH] nodejitsu: add mongo store back in --- lib/server/index.js | 18 +++++++++++++++--- package.json | 4 +++- src/server/index.coffee | 8 ++++---- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/lib/server/index.js b/lib/server/index.js index f8b8be056c..0e858f6ba1 100644 --- a/lib/server/index.js +++ b/lib/server/index.js @@ -1,5 +1,5 @@ // Generated by CoffeeScript 1.3.3 -var ONE_YEAR, app, derby, exports, express, expressApp, gzippo, http, path, publicPath, root, server, serverError; +var MongoStore, ONE_YEAR, app, derby, exports, express, expressApp, gzippo, http, path, publicPath, root, server, serverError; http = require('http'); @@ -9,6 +9,8 @@ express = require('express'); gzippo = require('gzippo'); +MongoStore = require('connect-mongo')(express); + derby = require('derby'); app = require('../app'); @@ -26,7 +28,11 @@ publicPath = path.join(root, 'public'); })).use(express.compress()).use(express.cookieParser('secret_sauce')).use(express.session({ cookie: { maxAge: ONE_YEAR - } + }, + store: new MongoStore({ + db: 'habitrpg', + collection: 'express-sessions' + }) })).use(app.session()).use(app.router()).use(expressApp.router).use(serverError(root)); exports = module.exports = server = http.createServer(expressApp); @@ -35,6 +41,12 @@ expressApp.all('*', function(req) { throw "404: " + req.url; }); +derby.use(require('racer-db-mongo')); + exports.store = app.createStore({ - listen: server + listen: server, + db: { + type: 'Mongo', + uri: 'mongodb://localhost/habitrpg' + } }); diff --git a/package.json b/package.json index 1e23b5b7f6..39c1c1c9e9 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,14 @@ { "name": "habitrpg", "description": "", - "version": "0.0.0-5", + "version": "0.0.0-7", "main": "./server.js", "dependencies": { "derby": "*", "express": "3.x", "gzippo": ">=0.1.4", + "racer-db-mongo": "*", + "connect-mongo": ">=0.1.9", "derby-ui-boot": "*" }, "private": true, diff --git a/src/server/index.coffee b/src/server/index.coffee index 021ac18336..4d6fdf0f9a 100644 --- a/src/server/index.coffee +++ b/src/server/index.coffee @@ -2,7 +2,7 @@ http = require 'http' path = require 'path' express = require 'express' gzippo = require 'gzippo' -# MongoStore = require('connect-mongo')(express) +MongoStore = require('connect-mongo')(express) derby = require 'derby' app = require '../app' serverError = require './serverError' @@ -30,7 +30,7 @@ publicPath = path.join root, 'public' .use(express.cookieParser 'secret_sauce') .use(express.session cookie: {maxAge: ONE_YEAR} - # store: new MongoStore(db: 'habitrpg', collection: 'express-sessions') + store: new MongoStore(db: 'habitrpg', collection: 'express-sessions') ) .use(app.session()) @@ -50,11 +50,11 @@ expressApp.all '*', (req) -> ## STORE SETUP ## -# derby.use(require 'racer-db-mongo') +derby.use(require 'racer-db-mongo') exports.store = app.createStore listen: server - # db: {type: 'Mongo', uri: 'mongodb://localhost/habitrpg'} + db: {type: 'Mongo', uri: 'mongodb://localhost/habitrpg'} # Would implement cron here, using node-cron & https://github.com/codeparty/derby/issues/99#issuecomment-6596460 # But it's not working