Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-07-07 16:12:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into socket.io1.x

Browse Source
This commit is contained in:
barisusakli
2014-11-26 17:31:26 -05:00
parent d1fcb50c7d b7c4647e9a
commit 2ecfcc582f
83 changed files with 718 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/hotswap.js
View File

@@ -25,7 +25,7 @@ HotSwap.replace = function(id, router) {
if (idx) {
delete stack[idx].handle; // Destroy the old router
stack[idx].handle = router; // Replace with the new one
winston.info('[hotswap] Router with id `' + id + '` replaced successfully');
winston.verbose('[hotswap] Router with id `' + id + '` replaced successfully');
} else {
winston.warn('[hotswap] Could not find router in stack with hotswapId `' + id + '`');
}

6
src/meta/js.js
View File

@@ -135,7 +135,7 @@ module.exports = function(Meta) {
process.exit(0);
}
winston.info('[meta/js] Minification complete');
winston.verbose('[meta/js] Minification complete');
minifier.kill();
if (cluster.isWorker) {
@@ -204,7 +204,7 @@ module.exports = function(Meta) {
async.apply(fs.writeFile, path.join(__dirname, '../../public/nodebb.min.js.map'), Meta.js.map)
], function (err) {
if (!err) {
winston.info('[meta/js] Client-side minfile and mapping committed to disk.');
winston.verbose('[meta/js] Client-side minfile and mapping committed to disk.');
emitter.emit('meta:js.compiled');
} else {
winston.error('[meta/js] ' + err.message);
@@ -219,7 +219,7 @@ module.exports = function(Meta) {
fs.exists(scriptPath, function(exists) {
if (exists) {
if (!cluster.isWorker || process.env.cluster_setup === 'true') {
winston.info('[meta/js] (Experimental) Reading client-side scripts from file');
winston.verbose('[meta/js] (Experimental) Reading client-side scripts from file');
async.map([scriptPath, mapPath], fs.readFile, function(err, files) {
Meta.js.cache = files[0];
Meta.js.map = files[1];

2
src/meta/sounds.js
View File

@@ -45,7 +45,7 @@ module.exports = function(Meta) {
fs[process.platform !== 'win32' ? 'symlink' : 'link'](filePath, path.join(soundsPath, path.basename(filePath)), 'file', next);
}, function(err) {
if (!err) {
winston.info('[sounds] Sounds OK');
winston.verbose('[sounds] Sounds OK');
} else {
winston.error('[sounds] Could not initialise sounds: ' + err.message);
}

4
src/meta/templates.js
View File

@@ -43,7 +43,7 @@ Templates.compile = function(callback) {
if (err) {
return callback(err);
}
winston.info('[meta/templates] Compiling templates');
winston.verbose('[meta/templates] Compiling templates');
rimraf.sync(viewsPath);
mkdirp.sync(viewsPath);
@@ -116,7 +116,7 @@ Templates.compile = function(callback) {
winston.error('[meta/templates] ' + err.stack);
} else {
compileIndex(viewsPath, function() {
winston.info('[meta/templates] Successfully compiled templates.');
winston.verbose('[meta/templates] Successfully compiled templates.');
emitter.emit('templates:compiled');
if (callback) {
callback();

2
src/notifications.js
View File

@@ -19,7 +19,7 @@ var async = require('async'),
Notifications.init = function() {
if (process.env.NODE_ENV === 'development') {
winston.info('[notifications.init] Registering jobs.');
winston.verbose('[notifications.init] Registering jobs.');
}
new cron('*/30 * * * *', Notifications.prune, null, true);
};

27
src/plugins.js
View File

@@ -43,14 +43,12 @@ var fs = require('fs'),
hotswap.prepare(nbbApp);
if (global.env === 'development') {
winston.info('[plugins] Initializing plugins system');
winston.verbose('[plugins] Initializing plugins system');
}
Plugins.reload(function(err) {
if (err) {
if (global.env === 'development') {
winston.info('[plugins] NodeBB encountered a problem while loading plugins', err.message);
}
winston.error('[plugins] NodeBB encountered a problem while loading plugins', err.message);
return;
}
@@ -131,7 +129,7 @@ var fs = require('fs'),
Plugins.fireHook('static:app.load', {app: app, router: router, middleware: middleware, controllers: controllers}, function() {
hotswap.replace('plugins', router);
winston.info('[plugins] All plugins reloaded and rerouted');
winston.verbose('[plugins] All plugins reloaded and rerouted');
callback();
});
};
@@ -252,7 +250,7 @@ var fs = require('fs'),
// CSS Files for plugins
if (pluginData.css && pluginData.css instanceof Array) {
if (global.env === 'development') {
winston.info('[plugins] Found ' + pluginData.css.length + ' CSS file(s) for plugin ' + pluginData.id);
winston.verbose('[plugins] Found ' + pluginData.css.length + ' CSS file(s) for plugin ' + pluginData.id);
}
Plugins.cssFiles = Plugins.cssFiles.concat(pluginData.css.map(function(file) {
@@ -266,7 +264,7 @@ var fs = require('fs'),
// LESS files for plugins
if (pluginData.less && pluginData.less instanceof Array) {
if (global.env === 'development') {
winston.info('[plugins] Found ' + pluginData.less.length + ' LESS file(s) for plugin ' + pluginData.id);
winston.verbose('[plugins] Found ' + pluginData.less.length + ' LESS file(s) for plugin ' + pluginData.id);
}
Plugins.lessFiles = Plugins.lessFiles.concat(pluginData.less.map(function(file) {
@@ -280,7 +278,7 @@ var fs = require('fs'),
// Client-side scripts
if (pluginData.scripts && pluginData.scripts instanceof Array) {
if (global.env === 'development') {
winston.info('[plugins] Found ' + pluginData.scripts.length + ' js file(s) for plugin ' + pluginData.id);
winston.verbose('[plugins] Found ' + pluginData.scripts.length + ' js file(s) for plugin ' + pluginData.id);
}
Plugins.clientScripts = Plugins.clientScripts.concat(pluginData.scripts.map(function(file) {
@@ -327,7 +325,7 @@ var fs = require('fs'),
], function(err) {
if (!err) {
if (global.env === 'development') {
winston.info('[plugins] Loaded plugin: ' + pluginData.id);
winston.verbose('[plugins] Loaded plugin: ' + pluginData.id);
}
callback();
} else {
@@ -397,7 +395,6 @@ var fs = require('fs'),
return callback(null, params);
}
// if (global.env === 'development') winston.info('[plugins] Firing hook: \'' + hook + '\'');
var hookType = hook.split(':')[0];
switch (hookType) {
case 'filter':
@@ -480,17 +477,13 @@ var fs = require('fs'),
Plugins.toggleActive = function(id, callback) {
Plugins.isActive(id, function(err, active) {
if (err) {
if (global.env === 'development') {
winston.info('[plugins] Could not toggle active state on plugin \'' + id + '\'');
}
winston.warn('[plugins] Could not toggle active state on plugin \'' + id + '\'');
return callback(err);
}
db[(active ? 'setRemove' : 'setAdd')]('plugins:active', id, function(err, success) {
if (err) {
if (global.env === 'development') {
winston.info('[plugins] Could not toggle active state on plugin \'' + id + '\'');
}
winston.warn('[plugins] Could not toggle active state on plugin \'' + id + '\'');
return callback(err);
}
@@ -757,7 +750,7 @@ var fs = require('fs'),
for (var x=0,numPaths=paths.length;x<numPaths;x++) {
delete require.cache[paths[x]];
}
winston.info('[plugins] Plugin libraries removed from Node.js cache');
winston.verbose('[plugins] Plugin libraries removed from Node.js cache');
next();
});