Modifying app.js and git so bc lives in the FC directory

diff --git a/.gitmodules b/.gitmodules
index 46e94e308dc9e1cc30ffb3cac1ee29e89b27c969..c784a449f4c87e65e9e085e265fb1011148f2c25 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "etherpad-lite"]
        path = etherpad-lite
        url = https://github.com/chapel/etherpad-lite
+[submodule "bc"]
+       path = bc
+       url = https://github.com/finalsclubdev/bc.git

diff --git a/app.js b/app.js
index ce7010c3b46b15781f926d4177d82fcdfff30707..60871714762747ac6eb809f369c2991c2d8c0b56 100644 (file)
--- a/app.js
+++ b/app.js
@@ -134,6 +134,7 @@ app.configure(function(){
   // Sessions are stored in mongodb which allows them
   // to be persisted even between server restarts.
   app.set( 'sessionStore', new mongoStore( {
+    'db' : 'fc',
     'url' : app.set( 'dbUri' )
   }));
 
@@ -162,13 +163,8 @@ app.configure(function(){
   app.use( app.router );
 
   app.use(express.logger({ format: ':method :url' }));
-  // This is the errorHandler set in configuration earlier
-  // being set to a variable to be used after all other
-  // middleware is loaded. Error handling should always
-  // come last or near the bottom.
-  var errorHandler = app.set( 'errorHandler' );
-
-  app.use( errorHandler );
+  // This is the command to use the default express error logger/handler
+  app.use(express.errorHandler({ dumpExceptions: true }));
 });
 
 
@@ -1818,8 +1814,8 @@ process.on('uncaughtException', function (e) {
 
 // Launch
 
-mongoose.connect( app.set( 'dbUri' ) );
-mongoose.connection.db.serverConfig.connection.autoReconnect = true
+// mongoose now exepects a mongo url
+mongoose.connect( 'mongodb://localhost/fc' ); // FIXME: make relative to hostname
 
 var mailer = new Mailer( app.set('awsAccessKey'), app.set('awsSecretKey') );
 

diff --git a/bc b/bc
new file mode 160000 (submodule)
index 0000000..3ee3af3
--- /dev/null
+++ b/bc
@@ -0,0 +1 @@
+Subproject commit 3ee3af3ffc3d0cca4453bf3a4c79e399a803fa51