GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-11-29 23:39:24 +01:00
Code Issues Projects Releases Wiki Activity

ProcessManager: clean up kill command; add can-kill to admin cap group

Browse Source
This commit is contained in:
Pragmatic Software 2020-02-14 20:04:14 -08:00
parent 42dbf468b2
commit 1a2d4064a1
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PBot/ProcessManager.pm
View File

@ -25,6 +25,7 @@ sub initialize {
my ($self, %conf) = @_; my ($self, %conf) = @_;
$self->{pbot}->{commands}->register(sub { $self->ps_cmd(@_) }, 'ps', 0); $self->{pbot}->{commands}->register(sub { $self->ps_cmd(@_) }, 'ps', 0);
$self->{pbot}->{commands}->register(sub { $self->kill_cmd(@_) }, 'kill', 1); $self->{pbot}->{commands}->register(sub { $self->kill_cmd(@_) }, 'kill', 1);
$self->{pbot}->{capabilities}->add('admin', 'can-kill');
$self->{processes} = {}; $self->{processes} = {};
} }
@ -44,18 +45,13 @@ sub ps_cmd {
sub kill_cmd { sub kill_cmd {
my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_; my ($self, $from, $nick, $user, $host, $arguments, $stuff) = @_;
my $usage = "Usage: kill <pids...>"; my $usage = "Usage: kill <pids...>";
my @pids; my @pids;
while (1) { while (1) {
my $pid = $self->{pbot}->{interpreter}->shift_arg($stuff->{arglist}) // last; my $pid = $self->{pbot}->{interpreter}->shift_arg($stuff->{arglist}) // last;
return "No such pid $pid." if not exists $self->{processes}->{$pid};
push @pids, $pid; push @pids, $pid;
} }
return $usage if not @pids; return $usage if not @pids;
foreach my $pid (@pids) {
return "No such pid $pid." if not exists $self->{processes}->{$pid};
}
kill 'INT', @pids; kill 'INT', @pids;
return "Killed."; return "Killed.";
} }