mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-12-20 15:30:39 +01:00
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user