diff --git a/CHANGELOG.md b/CHANGELOG.md index 5feb40511..90bc5c2cd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,12 +1,4 @@ -## 6.0.8 - -- fix: package-lock update - -## 6.0.7 - -- fix: ansis-node10 https://github.com/Unitech/pm2/commit/99d9224e940d119a1ad5b241b4fc4e0db7c830ed @webdiscus - ## 6.0.6 - refactor: replace chalk with smaller alternative by @webdiscus diff --git a/README.md b/README.md index 83dd30445..e0117d577 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ ![https://raw.githubusercontent.com/Unitech/pm2/master/pres/pm2-logo-2.png](https://raw.githubusercontent.com/Unitech/pm2/master/pres/pm2-logo-2.png) +
+
P(rocess) M(anager) 2
Runtime Edition

diff --git a/lib/API/UX/pm2-describe.js b/lib/API/UX/pm2-describe.js index ec1773827..8897aaabd 100644 --- a/lib/API/UX/pm2-describe.js +++ b/lib/API/UX/pm2-describe.js @@ -68,7 +68,10 @@ module.exports = function(proc) { { 'exec mode' : pm2_env.exec_mode }, { 'node.js version' : pm2_env.node_version }, - { 'node env': pm2_env.env.NODE_ENV }, + + { 'NODE_ENV' : (pm2_env.env && pm2_env.env.NODE_ENV) || 'N/A' }, + { 'PM2 --env' : pm2_env.pm2_env_name || (pm2_env.env && pm2_env.env.PM2_ENV) || 'default' }, + { 'watch & reload' : pm2_env.watch ? chalk.green.bold('✔') : '✘' }, { 'unstable restarts' : pm2_env.unstable_restarts }, { 'created at' : created_at } diff --git a/lib/Common.js b/lib/Common.js index 4107dca74..927627c64 100644 --- a/lib/Common.js +++ b/lib/Common.js @@ -616,6 +616,7 @@ Common.mergeEnvironmentVariables = function(app_env, env_name, deploy_conf) { */ Object.assign(new_conf, app); + new_conf.pm2_env_name = env_name; if (env_name) { // First merge variables from deploy.production.env object as least priority. if (deploy_conf && deploy_conf[env_name] && deploy_conf[env_name]['env']) { @@ -642,6 +643,7 @@ Common.mergeEnvironmentVariables = function(app_env, env_name, deploy_conf) { Object.assign(res, new_conf.env); Object.assign(res.current_conf, new_conf); + res.pm2_env_name = new_conf.pm2_env_name; // #2541 force resolution of node interpreter if (app.exec_interpreter && app.exec_interpreter.indexOf('@') > -1) { diff --git a/package-lock.json b/package-lock.json index 9242691fb..40cb88f26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "pm2", - "version": "6.0.8", + "version": "6.0.6", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "pm2", - "version": "6.0.8", + "version": "6.0.6", "license": "AGPL-3.0", "dependencies": { "@pm2/agent": "~2.1.1", diff --git a/package.json b/package.json index c445afdff..ff22b3d39 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "pm2", "preferGlobal": true, - "version": "6.0.8", + "version": "6.0.6", "engines": { "node": ">=16.0.0" },