Merge branch 'master' of github.com:okfocus/waiting-game

1 files changed, 17 insertions, 4 deletions

diff --git a/app.js b/app.js
index fcb5388..69c83c3 100644
--- a/app.js
+++ b/app.js
@@ -8,16 +8,19 @@ var express = require('express'),
     user = require('./routes/user'),
     http = require('http'),
     path = require('path'),
-    io = require('socket.io').listen(app),
     passport = require('passport'),
     FacebookStrategy = require('passport-facebook').Strategy,
     mongoose = require('mongoose');
 
 var app = express();
 var server = http.createServer(app);
+var io = require('socket.io').listen(server);
+
+server.listen(3000);
 
 app.configure(function(){
-  app.set('port', process.env.PORT || 3000);
+//  app.set('port', process.env.PORT || 3000);
+  app.set('port', 3000);
   app.set('views', __dirname + '/views');
   app.set('view engine', 'ejs');
   app.use(express.favicon());
@@ -37,11 +40,16 @@ app.configure('development', function(){
   mongoose.connect('mongodb://localhost/waiting');
 });
 
+app.configure('production', function(){
+  app.use(express.errorHandler());
+  mongoose.connect('mongodb://localhost/waiting');
+});
+
 io.configure('production', function(){
     io.enable('browser client minification');  // send minified client
     io.enable('browser client etag');          // apply etag caching logic based on version number
     io.enable('browser client gzip');          // gzip the file
-    io.set('log level', 1);                    // reduce logging
+//    io.set('log level', 1);                    // reduce logging
     io.set('transports', [                     // enable all transports (optional if you want flashsocket)
         'websocket'
         , 'flashsocket'
@@ -66,9 +74,14 @@ passport.deserializeUser(function(id, done) {
 });
 
 passport.use(new FacebookStrategy({
+/*
     clientID: "287721021330454",
     clientSecret: "67757ad86113da449165c175b292a75e",
     callbackURL: "http://localhost:3000/auth/facebook/callback"
+*/
+    clientID: "303580399744488",
+    clientSecret: "2de03fb633e9529b511b33faebc659c8",
+    callbackURL: "http://ec2-107-20-35-143.compute-1.amazonaws.com/auth/facebook/callback"
   },
   function(accessToken, refreshToken, profile, done) {
     User.findOne({ facebookId: profile.id }, function (err, user) {
@@ -141,7 +154,7 @@ function getHighScores (callback) {
   return User.find({}).sort('-count').limit(10).exec(callback);
 }
 
-var io = require("socket.io").listen(server), userCount = 0, users = {}, timeout;
+var userCount = 0, users = {}, timeout;
 
 timeout = setInterval(function(){
 	io.sockets.emit('update', { 'now': Date.now() });