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

cleanup / lint before diving in

Browse Source
This commit is contained in:
psychobunny
2016-01-18 14:05:53 -05:00
parent f17fa3ca11
commit 3cc5e1473f
1 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/meta/js.js
View File

@@ -125,22 +125,7 @@ module.exports = function(Meta) {
Meta.js.minify = function(callback) {
if (nconf.get('isPrimary') === 'true') {
/**
* Check if the parent process is running with the debug option --debug (or --debug-brk)
*/
var forkProcessParams = {};
if(global.v8debug || process.execArgv.indexOf('--debug') != -1) {
/**
* use the line below if you want to debug minifier.js script too (or even --debug-brk option, but
* you'll have to setup your debugger and connect to the forked process)
*/
//forkProcessParams = {execArgv: ['--debug=' + (global.process.debugPort + 1), '--nolazy']};
/**
* otherwise, just clean up --debug/--debug-brk options which are set up by default from the parent one
*/
forkProcessParams = {execArgv: []};
}
var forkProcessParams = setupDebugging();
var minifier = Meta.js.minifierProc = fork('minifier.js', [], forkProcessParams),
onComplete = function(err) {
@@ -200,7 +185,7 @@ module.exports = function(Meta) {
}
};
Meta.js.killMinifier = function(callback) {
Meta.js.killMinifier = function() {
if (Meta.js.minifierProc) {
Meta.js.minifierProc.kill('SIGTERM');
}
@@ -268,8 +253,7 @@ module.exports = function(Meta) {
}).filter(function(a) { return a; });
if (matches.length) {
var relPath = jsPath.slice(('plugins/' + matches[0]).length),
pluginId = matches[0].split(path.sep)[0];
var relPath = jsPath.slice(('plugins/' + matches[0]).length);
return plugins.staticDirs[matches[0]] + relPath;
} else {
@@ -282,4 +266,25 @@ module.exports = function(Meta) {
callback();
});
}
function setupDebugging() {
/**
* Check if the parent process is running with the debug option --debug (or --debug-brk)
*/
var forkProcessParams = {};
if(global.v8debug || parseInt(process.execArgv.indexOf('--debug'), 10) !== -1) {
/**
* use the line below if you want to debug minifier.js script too (or even --debug-brk option, but
* you'll have to setup your debugger and connect to the forked process)
*/
//forkProcessParams = {execArgv: ['--debug=' + (global.process.debugPort + 1), '--nolazy']};
/**
* otherwise, just clean up --debug/--debug-brk options which are set up by default from the parent one
*/
forkProcessParams = {execArgv: []};
}
return forkProcessParams;
}
};