Skip to content

Commit

Permalink
Merge pull request #3721 from Unitech/io_conf
Browse files Browse the repository at this point in the history
fix: return the configuration and allow custom conf to override defau…
  • Loading branch information
wallet77 authored Jun 18, 2018
2 parents 0bc000b + 37dc7de commit 70ec1f8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/ProcessUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ module.exports = {
deep_metrics: process.env.deep_monitoring === 'true' || false
};

Object.assign(conf, defaultConf);
const mergedConf = Object.assign(defaultConf, conf);

pmx.init(conf);
pmx.init(mergedConf);

if(require('semver').satisfies(process.versions.node, '>= 8.0.0')) {
var url = '';
Expand Down

0 comments on commit 70ec1f8

Please sign in to comment.