Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Julian Lam
2018-02-23 14:48:38 -05:00
453 changed files with 1073 additions and 513 deletions

View File

@@ -1,5 +1,6 @@
'use strict';
var os = require('os');
var async = require('async');
var nconf = require('nconf');
var winston = require('winston');
@@ -84,6 +85,7 @@ function onConnect(socket) {
socket.join('sess_' + socket.request.signedCookies[nconf.get('sessionKey')]);
io.sockets.sockets[socket.id].emit('checkSession', socket.uid);
io.sockets.sockets[socket.id].emit('setHostname', os.hostname());
}
function onMessage(socket, payload) {