updated route modulation

master
Keith Irwin 2016-03-31 02:13:04 +00:00
parent 444cc4f3eb
commit 6811c96fc9
1 changed files with 13 additions and 10 deletions

View File

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