Skip to content
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