Skip to content

Commit 8e6481b

Browse files
committed
Merge branch 'master' into development
2 parents e868f00 + 476542f commit 8e6481b

File tree

5 files changed

+41
-10
lines changed

5 files changed

+41
-10
lines changed

.changelogrc

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
"intro": "",
55
"branch" : "development",
66
"repo_url": "https://github.com/Unitech/pm2",
7-
"version_name" : "3.0.1",
8-
"tag": "3.0.0",
7+
"version_name" : "3.0.3",
8+
"tag": "3.0.2",
99
"file": "currentTagChangelog.md",
1010
"template": "changelogTemplate.md",
1111
"sections": [

CHANGELOG.md

+27-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
1-
## 3.0.1 ( Mon Jul 23 2018 14:13:35 GMT+0200 (CEST) )
1+
## 3.0.3 ( Tue Aug 07 2018 23:35:05 GMT+0200 (CEST) )
2+
3+
4+
## Bug Fixes
5+
- pm2 plus + register
6+
([277ec6ba](https://github.com/Unitech/pm2/commit/277ec6ba8d1cdda7f8fdf11eb9d9d33c2c095d65))
7+
8+
9+
10+
11+
## 3.0.2 ( Tue Aug 07 2018 23:35:05 GMT+0200 (CEST) )
12+
13+
14+
## Bug Fixes
15+
- allow tracing activation
16+
([f297ef1e](https://github.com/Unitech/pm2/commit/f297ef1ebbec292aedcfa48c27e3f31b8f206633))
217

318

19+
20+
21+
## Branchs merged
22+
- Merge branch 'development'
23+
([80c94dd3](https://github.com/Unitech/pm2/commit/80c94dd3261544f627612ce4b541356e4adbc51f))
24+
25+
26+
27+
28+
## 3.0.1 ( Mon Jul 23 2018 14:13:35 GMT+0200 (CEST) )
29+
430
## Bug Fixes
531
- allow to set a name via pm2 link
632
([ebffb609](https://github.com/Unitech/pm2/commit/ebffb609cf4da195c72ee67d8341c63b78f0654e))

lib/API/pm2-plus/PM2IO.js

+8-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,14 @@ module.exports = function(CLI) {
145145
}).then(res => {
146146
const bucket = res.data.bucket
147147
console.log(chalk.bold.green('[+] Bucket created!'))
148-
self.link(bucket, () => {
148+
149+
var connection_info = {
150+
public_key: bucket.public_id,
151+
secret_key: bucket.secret_id,
152+
pm2_version: pkg.version
153+
}
154+
155+
self.link(connection_info, () => {
149156
finalize(bucket)
150157
})
151158
})

lib/ProcessUtils.js

+3-5
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ module.exports = {
1414

1515
var activate = process.env.km_link == 'true' || process.env.deep_monitoring === 'true' || false;
1616

17-
// transaction: {
18-
// tracing: activate
19-
// },
20-
2117
let defaultConf = {
18+
transactions: (process.env.trace === 'true' || process.env.deep_monitoring === 'true') || false,
19+
http: activate,
2220
metrics: {
2321
deepMetrics: activate,
24-
v8: activate
22+
v8: activate || process.env.v8 === 'true'
2523
},
2624
actions: {
2725
eventLoopDump: activate,

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "pm2",
33
"preferGlobal": true,
4-
"version": "3.0.1",
4+
"version": "3.0.3",
55
"engines": {
66
"node": ">=4.0.0"
77
},

0 commit comments

Comments
 (0)