Skip to content

Commit

Permalink
Merge branch 'master' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
Unitech committed Aug 23, 2018
2 parents 03af38c + 5a8dd7d commit 95321c6
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 0 additions & 2 deletions lib/API/pm2-plus/PM2IO.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,7 @@ module.exports = function(CLI) {

console.log(cst.PM2_IO_MSG + 'Access to the remote dashboard: https://app.pm2.io/#/r/' + bucket.public_id);

self.speedList()
setTimeout(function() {
console.log(chalk.bold.green('[+] Exiting now.'))
process.exit(cst.SUCCESS_EXIT);
}, 200)
})
Expand Down
4 changes: 2 additions & 2 deletions lib/API/pm2-plus/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = function(CLI) {
};

CLI.prototype.clearSetup = function (opts, cb) {
const modules = ['pm2-logrotate', 'pm2-server-monit', 'event-loop-inspector']
const modules = ['event-loop-inspector']
this.gl_is_km_linked = false

if (semver.satisfies(process.version, '< 10.0.0')) {
Expand Down Expand Up @@ -86,7 +86,7 @@ module.exports = function(CLI) {

processesAreAlreadyMonitored(self, (already_monitored) => {
if (already_monitored) {
console.log(cst.PM2_IO_MSG + `PM2 ${opts.type} bundle already installed`);
console.log(cst.PM2_IO_MSG + `PM2 ${opts.type || ''} bundle already installed`);
return cb()
}

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "pm2",
"preferGlobal": true,
"version": "3.0.3",
"version": "3.0.4",
"engines": {
"node": ">=4.0.0"
},
Expand Down

0 comments on commit 95321c6

Please sign in to comment.