Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: trigger all the process using 'all' or trigger all processes in a particular namespace #4518

Merged
merged 1 commit into from Apr 12, 2020
Merged

feat: trigger all the process using 'all' or trigger all processes in a particular namespace #4518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/API/Extra.js
View file
Open in desktop
Expand Up @@ -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);
}
Expand Down
4 changes: 3 additions & 1 deletion lib/God/ActionMethods.js
View file
Open in desktop
Expand Up @@ -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)) {

Expand Down
6 changes: 4 additions & 2 deletions lib/God/ClusterMode.js
View file
Open in desktop
Expand Up @@ -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
}
});
}
Expand All @@ -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
}
});
}
Expand Down
12 changes: 8 additions & 4 deletions lib/God/ForkMode.js
View file
Open in desktop
Expand Up @@ -162,7 +162,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
Expand Down Expand Up @@ -194,7 +195,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
Expand Down Expand Up @@ -224,7 +226,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
}
});
});
Expand All @@ -248,7 +251,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
}
});
}
Expand Down
6 changes: 3 additions & 3 deletions lib/binaries/CLI.js
View file
Open in desktop
Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand All @@ -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) {
Expand Down