Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

<br/>
<br/>
<b>P</b>(rocess) <b>M</b>(anager) <b>2</b><br/>
<i>Runtime Edition</i>
<br/><br/>
Expand Down
5 changes: 4 additions & 1 deletion lib/API/UX/pm2-describe.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 2 additions & 0 deletions lib/Common.js
Original file line number Diff line number Diff line change
Expand Up @@ -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']) {
Expand All @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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": "6.0.8",
"version": "6.0.6",
"engines": {
"node": ">=16.0.0"
},
Expand Down