Merge pull request #4518 from bvsubhash/trigger-namespace-or-all

feat: trigger all the process using 'all' or trigger all processes in a particular namespace
Unitech · Apr 12, 2020 · a016999 · a016999
2 parents bf582e1 + 9f2d8ca
commit a016999
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 12 deletions.
diff --git a/lib/API/Extra.js b/lib/API/Extra.js
@@ -449,9 +449,9 @@ module.exports = function(CLI) {
 
     this.launchBus(function(err, bus) {
       bus.on('axm:reply', function(ret) {
-        if (ret.process.name == pm_id || ret.process.pm_id == pm_id) {
+        if (ret.process.name == pm_id || ret.process.pm_id == pm_id || ret.process.namespace == pm_id || pm_id == 'all') {
           results.push(ret);
-          Common.printOut('[%s:%s]=%j', ret.process.name, ret.process.pm_id, ret.data.return);
+          Common.printOut('[%s:%s:%s]=%j', ret.process.name, ret.process.pm_id, ret.process.namespace, ret.data.return);
           if (++counter == process_wait_count)
             return cb ? cb(null, results) : that.exitCli(cst.SUCCESS_EXIT);
         }

diff --git a/lib/God/ActionMethods.js b/lib/God/ActionMethods.js
@@ -808,7 +808,9 @@ module.exports = function(God) {
 
 
         if ((p.basename(proc_env.pm_exec_path) == name ||
-             proc_env.name == name) &&
+             proc_env.name == name ||
+             proc_env.namespace == name ||
+             name == 'all') &&
             (proc_env.status == cst.ONLINE_STATUS ||
              proc_env.status == cst.LAUNCHING_STATUS)) {
 

diff --git a/lib/God/ClusterMode.js b/lib/God/ClusterMode.js
@@ -68,7 +68,8 @@ module.exports = function ClusterMode(God) {
           process :  {
             pm_id      : clu.pm2_env.pm_id,
             name       : clu.pm2_env.name,
-            rev        : (clu.pm2_env.versioning && clu.pm2_env.versioning.revision) ? clu.pm2_env.versioning.revision : null
+            rev        : (clu.pm2_env.versioning && clu.pm2_env.versioning.revision) ? clu.pm2_env.versioning.revision : null,
+            namespace  : clu.pm2_env.namespace
           }
         });
       }
@@ -90,7 +91,8 @@ module.exports = function ClusterMode(God) {
           raw     : msg,
           process :  {
             pm_id      : clu.pm2_env.pm_id,
-            name       : clu.pm2_env.name
+            name       : clu.pm2_env.name,
+            namespace  : clu.pm2_env.namespace
           }
         });
       }

diff --git a/lib/God/ForkMode.js b/lib/God/ForkMode.js
@@ -168,7 +168,8 @@ module.exports = function ForkMode(God) {
           process : {
             pm_id      : cspr.pm2_env.pm_id,
             name       : cspr.pm2_env.name,
-            rev        : (cspr.pm2_env.versioning && cspr.pm2_env.versioning.revision) ? cspr.pm2_env.versioning.revision : null
+            rev        : (cspr.pm2_env.versioning && cspr.pm2_env.versioning.revision) ? cspr.pm2_env.versioning.revision : null,
+            namespace  : cspr.pm2_env.namespace
           },
           at  : Utility.getDate(),
           data : log_data
@@ -200,7 +201,8 @@ module.exports = function ForkMode(God) {
           process : {
             pm_id      : cspr.pm2_env.pm_id,
             name       : cspr.pm2_env.name,
-            rev        : (cspr.pm2_env.versioning && cspr.pm2_env.versioning.revision) ? cspr.pm2_env.versioning.revision : null
+            rev        : (cspr.pm2_env.versioning && cspr.pm2_env.versioning.revision) ? cspr.pm2_env.versioning.revision : null,
+            namespace  : cspr.pm2_env.namespace
           },
           at  : Utility.getDate(),
           data : log_data
@@ -230,7 +232,8 @@ module.exports = function ForkMode(God) {
               process : {
                 pm_id      : cspr.pm2_env.pm_id,
                 name       : cspr.pm2_env.name,
-                versioning : cspr.pm2_env.versioning
+                versioning : cspr.pm2_env.versioning,
+                namespace  : cspr.pm2_env.namespace
               }
             });
           });
@@ -254,7 +257,8 @@ module.exports = function ForkMode(God) {
             raw     : msg,
             process :  {
               pm_id      : cspr.pm2_env.pm_id,
-              name       : cspr.pm2_env.name
+              name       : cspr.pm2_env.name,
+              namespace  : cspr.pm2_env.namespace
             }
           });
         }

diff --git a/lib/binaries/CLI.js b/lib/binaries/CLI.js
@@ -296,7 +296,7 @@ commander.command('start [name|namespace|file|ecosystem|id...]')
     }
   });
 
-commander.command('trigger <proc_name> <action_name> [params]')
+commander.command('trigger <id|proc_name|namespace|all> <action_name> [params]')
   .description('trigger process action')
   .action(function(pm_id, action_name, params) {
     pm2.trigger(pm_id, action_name, params);
@@ -398,7 +398,7 @@ commander.command('profile:cpu [time]')
 //
 // Reload process(es)
 //
-commander.command('reload <name|all>')
+commander.command('reload <id|name|namespace|all>')
   .description('reload processes (note that its for app using HTTP/HTTPS)')
   .action(function(pm2_id) {
     pm2.reload(pm2_id, commander);
@@ -420,7 +420,7 @@ commander.command('inspect <name>')
 //
 // Stop and delete a process by name from database
 //
-commander.command('delete <name|id|script|all|json|stdin...>')
+commander.command('delete <name|id|namespace|script|all|json|stdin...>')
   .alias('del')
   .description('stop and delete a process from pm2 process list')
   .action(function(name) {