fix: reloading with --update-env option #3192

Author: mkalygin

lib/API.js

@@ -1071,7 +1071,7 @@ class API {
         });
 
         // When we are processing JSON, allow to keep the new env by default
-        env.updateEnv = true;
+        env.updateEnv = typeof(opts.updateEnv) === 'undefined' ? true : opts.updateEnv;
 
         // Pass `env` option
         that._operate(action, proc_name, env, function(err, ret) {

lib/Utility.js

@@ -33,10 +33,10 @@ var Utility = module.exports = {
   },
   extendExtraConfig : function(proc, opts) {
     if (opts.env && opts.env.current_conf) {
-      if (opts.env.current_conf.env &&
-          typeof(opts.env.current_conf.env) === 'object' &&
-          Object.keys(opts.env.current_conf.env).length === 0)
-        delete opts.env.current_conf.env
+      // NOTE: `env` gets overriden by `Utility.extendMix` call. Instead, we want to merge envs.
+      if (opts.env.current_conf.env && typeof(opts.env.current_conf.env) === 'object')
+        Utility.extendMix(proc.pm2_env.env, opts.env.current_conf.env);
+        delete opts.env.current_conf.env;
 
       Utility.extendMix(proc.pm2_env, opts.env.current_conf);
       delete opts.env.current_conf;