Merge branch 'master' into development

Unitech · Aug 21, 2018 · 8e6481b · 8e6481b
2 parents e868f00 + 476542f
commit 8e6481b
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 10 deletions.
diff --git a/.changelogrc b/.changelogrc
@@ -4,8 +4,8 @@
     "intro": "",
     "branch" : "development",
     "repo_url": "https://github.com/Unitech/pm2",
-    "version_name" : "3.0.1",
-    "tag": "3.0.0",
+    "version_name" : "3.0.3",
+    "tag": "3.0.2",
     "file": "currentTagChangelog.md",
     "template": "changelogTemplate.md",
     "sections": [

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,32 @@
-## 3.0.1 ( Mon Jul 23 2018 14:13:35 GMT+0200 (CEST) )
+## 3.0.3 ( Tue Aug 07 2018 23:35:05 GMT+0200 (CEST) )
+
+
+## Bug Fixes
+  - pm2 plus + register
+  ([277ec6ba](https://github.com/Unitech/pm2/commit/277ec6ba8d1cdda7f8fdf11eb9d9d33c2c095d65))
+
+
+
+
+## 3.0.2 ( Tue Aug 07 2018 23:35:05 GMT+0200 (CEST) )
+
+
+## Bug Fixes
+  - allow tracing activation
+  ([f297ef1e](https://github.com/Unitech/pm2/commit/f297ef1ebbec292aedcfa48c27e3f31b8f206633))
 
 
+
+
+## Branchs merged
+  - Merge branch 'development'
+  ([80c94dd3](https://github.com/Unitech/pm2/commit/80c94dd3261544f627612ce4b541356e4adbc51f))
+
+
+
+
+## 3.0.1 ( Mon Jul 23 2018 14:13:35 GMT+0200 (CEST) )
+
 ## Bug Fixes
   - allow to set a name via pm2 link
   ([ebffb609](https://github.com/Unitech/pm2/commit/ebffb609cf4da195c72ee67d8341c63b78f0654e))

diff --git a/lib/API/pm2-plus/PM2IO.js b/lib/API/pm2-plus/PM2IO.js
@@ -145,7 +145,14 @@ module.exports = function(CLI) {
         }).then(res => {
           const bucket = res.data.bucket
           console.log(chalk.bold.green('[+] Bucket created!'))
-          self.link(bucket, () => {
+
+          var connection_info = {
+            public_key: bucket.public_id,
+            secret_key: bucket.secret_id,
+            pm2_version: pkg.version
+          }
+
+          self.link(connection_info, () => {
             finalize(bucket)
           })
         })

diff --git a/lib/ProcessUtils.js b/lib/ProcessUtils.js
@@ -14,14 +14,12 @@ module.exports = {
 
       var activate = process.env.km_link == 'true' || process.env.deep_monitoring === 'true' || false;
 
-      // transaction: {
-      //   tracing: activate
-      // },
-
       let defaultConf = {
+        transactions: (process.env.trace === 'true' || process.env.deep_monitoring === 'true') || false,
+        http: activate,
         metrics: {
           deepMetrics: activate,
-          v8: activate
+          v8: activate || process.env.v8 === 'true'
         },
         actions: {
           eventLoopDump: activate,

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pm2",
   "preferGlobal": true,
-  "version": "3.0.1",
+  "version": "3.0.3",
   "engines": {
     "node": ">=4.0.0"
   },