Merge pull request #3553 from Unitech/fix_tracing_not_working

fix: remove unused variable when trying to use tracing
Unitech · Mar 19, 2018 · 9d51fe0 · 9d51fe0
2 parents 55412f2 + 23fd8ec
commit 9d51fe0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/lib/ProcessUtils.js b/lib/ProcessUtils.js
@@ -3,7 +3,7 @@ module.exports = {
     if (process.env.pmx !== 'false') {
       const pmx = require('pmx');
       pmx.init({
-        transactions: (process.env.km_link === 'true' && (process.env.trace === 'true' || process.env.deep_monitoring === 'true')) || false,
+        transactions: (process.env.trace === 'true' || process.env.deep_monitoring === 'true') || false,
         http: process.env.km_link === 'true' || false,
         v8: process.env.v8 === 'true' || process.env.deep_monitoring === 'true' || false,
         event_loop_dump: process.env.event_loop_inspector === 'true' || process.env.deep_monitoring === 'true' || false,

diff --git a/test/interface/bus.fork.spec.mocha.js b/test/interface/bus.fork.spec.mocha.js
@@ -89,7 +89,6 @@ describe('PM2 BUS / RPC', function() {
       var plan = new Plan(2, done);
 
       pm2_bus.on('*', function(event, data) {
-        console.log(event);
         if (event == 'process:event') {
           event.should.eql('process:event');
           data.should.have.properties(PROCESS_EVENT);

diff --git a/test/interface/pm2.link.check.mocha.js b/test/interface/pm2.link.check.mocha.js
@@ -37,7 +37,7 @@ describe('PM2 link variable checks', function() {
       setTimeout(function() {
         pm2.list(function(err, dt) {
           dt[0].pm2_env.km_link.should.be.false();
-          dt[0].pm2_env.axm_options.transactions.should.be.false();
+          dt[0].pm2_env.axm_options.transactions.should.be.true();
           done();
         });
       }, 500);