diff --git a/lib/Satan.js b/lib/Satan.js index f0c65e2d..bb81cec6 100644 --- a/lib/Satan.js +++ b/lib/Satan.js @@ -230,11 +230,17 @@ Satan.launchDaemon = function launchDaemon(cb) { var SatanJS = p.resolve(p.dirname(module.filename), 'Satan.js'); var InteractorDaemonizer = require('./Interactor/InteractorDaemonizer.js'); + var node_args = []; var out = fs.openSync(cst.PM2_LOG_FILE_PATH, 'a'), err = fs.openSync(cst.PM2_LOG_FILE_PATH, 'a'); - var child = require('child_process').spawn('node', [SatanJS], { + if (process.env.PM2_NODE_OPTIONS) + node_args = node_args.concat(process.env.PM2_NODE_OPTIONS.split(' ')); + + node_args.push(SatanJS); + + var child = require('child_process').spawn('node', node_args, { detached : true, cwd : process.cwd(), env : util._extend({ diff --git a/test/bash/harmony.sh b/test/bash/harmony.sh index 9876e000..0c39e18a 100644 --- a/test/bash/harmony.sh +++ b/test/bash/harmony.sh @@ -16,15 +16,13 @@ $pm2 list $pm2 kill PM2_NODE_OPTIONS='--harmony' `pwd`/../../bin/pm2 start harmony.js -sleep 2 -should 'should not fail when passing harmony option to V8' 'errored' 0 +sleep 4 $pm2 list +should 'should not fail when passing harmony option to V8' 'restart_time: 0' 1 $pm2 kill - $pm2 start harmony.js --node-args="--harmony" sleep 8 $pm2 list should 'should not fail when passing node-args=harmony opts' 'errored' 0 -$pm2 list $pm2 kill