diff --git a/server.js b/server.js index cf22636..8cced06 100644 --- a/server.js +++ b/server.js @@ -1,4 +1,4 @@ -express = require('express'), +var express = require('express'), crash = require('express-crash'), bodyParser = require('body-parser'), cookieParser = require('cookie-parser'), @@ -8,7 +8,6 @@ express = require('express'), passport = require('passport'), flash = require('connect-flash'), secret = require('./config/secrets.js'), - auth = require('./config/auth.js'), User = require('./config/models/user.js'), routes = require('./config/routes.js'), app = express(), @@ -36,16 +35,18 @@ app.use(passport.session()); app.use('/static', express.static(__dirname+'/static')); routes(app); mongoose.connect(secret.mongoSetup, { - server:{socketOptions:{ keepAlive:1, connectTimeoutMS:30000 }}, - replset:{socketOptions:{ keepAlive:1, connectTimeoutMS:30000 }} + server:{socketOptions:{ + keepAlive:1, connectTimeoutMS:30000 }}, + replset:{socketOptions:{ + keepAlive:1, connectTimeoutMS:30000 }} }); // Handle errors -var handle404 = function(err,req,res,next) { +var handle404 = function(req,res) { res.render('error.html', {code:404}); }; -var handle500 = function(err,req,res,next) { +var handle500 = function(req,res) { res.render('error.html', {code:500}); }; if (secret.url.substring(0,16)!='http://localhost') { @@ -79,7 +80,8 @@ io.on('connection', function(socket) { if (room.slice(0,4)!='app-'){ User.findById({_id:room}, function(err, user) { if (err) { console.log(err); } - if (user) { io.to('app-'+room).emit('activate','true'); } + if (user) { + io.to('app-'+room).emit('activate','true'); } }); } else { checkForUsers(room.slice(4)); @@ -102,7 +104,8 @@ io.on('connection', function(socket) { }); socket.onclose = function(reason){ - var closedroom = Object.keys(socket.adapter.sids[socket.id]).slice(1)[0]; + var closedroom = Object.keys( + socket.adapter.sids[socket.id]).slice(1)[0]; setTimeout(function() { checkForUsers(closedroom); }, 3000); @@ -123,8 +126,8 @@ passport.deserializeUser(function(id, done) { }); // SERVE -http.listen(62054, function(){ - console.log('Listening for http on port 62054'); +http.listen(secret.port, function(){ + console.log('Listening for http on port '+secret.port); checkForUsers(); });