Compare commits

...

4 Commits

Author SHA1 Message Date
barisusakli
accee7d05b use socket.io default and ["polling", "websocket"] 2014-12-25 14:16:44 -05:00
barisusakli
f403a297b4 only send back error for sortedSetsRemove 2014-12-24 02:09:08 -05:00
Julian Lam
73e7da6f03 0.6.0 2014-12-24 00:45:41 -05:00
Julian Lam
9c1b24c963 added shrinkwrap file 2014-12-24 00:45:36 -05:00
5 changed files with 2616 additions and 4 deletions

2610
npm-shrinkwrap.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,7 @@
"name": "nodebb",
"license": "GPLv3 or later",
"description": "NodeBB Forum",
"version": "0.6.0-dev",
"version": "0.6.0",
"homepage": "http://www.nodebb.org",
"repository": {
"type": "git",

View File

@@ -13,7 +13,7 @@ var apiController = {};
apiController.getConfig = function(req, res, next) {
var config = {};
config.relative_path = nconf.get('relative_path');
config.socketioTransports = nconf.get('socket.io:transports') || ['websocket', 'polling'];
config.socketioTransports = nconf.get('socket.io:transports') || ['polling', 'websocket'];
config.websocketAddress = nconf.get('socket.io:address') || '';
config.version = pkg.version;
config.siteTitle = meta.config.title || meta.config.browserTitle || 'NodeBB';

View File

@@ -59,7 +59,9 @@ module.exports = function(redisClient, module) {
};
module.sortedSetsRemove = function(keys, value, callback) {
multi('zrem', keys, value, callback);
multi('zrem', keys, value, function(err) {
callback(err);
});
};
module.sortedSetsRemoveRangeByScore = function(keys, min, max, callback) {

View File

@@ -33,7 +33,7 @@ Sockets.init = function(server) {
io.on('connection', onConnection);
io.listen(server, {
transports: nconf.get('socket.io:transports') || ['websocket', 'polling']
transports: nconf.get('socket.io:transports')
});
Sockets.server = io;