projects
/
spider.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ignore deleted messages when queueing
[spider.git]
/
cmd
/
kill.pl
diff --git
a/cmd/kill.pl
b/cmd/kill.pl
index c2062ba4bd69e0327ad98fac206f5e1b66f75279..9c7675fa44d8cd5c4bc8c90041381177ea0b4569 100644
(file)
--- a/
cmd/kill.pl
+++ b/
cmd/kill.pl
@@
-40,7
+40,7
@@
while (@f) {
my $from = $1;
my $to = $2;
@refs = grep { !($self->priv < 5 && $_->to ne $call && $_->from ne $call) } DXMsg::get_all() unless @refs;
my $from = $1;
my $to = $2;
@refs = grep { !($self->priv < 5 && $_->to ne $call && $_->from ne $call) } DXMsg::get_all() unless @refs;
- @refs = grep { $_->msgno >= $from && $_->msgno < $to } @refs;
+ @refs = grep { $_->msgno >= $from && $_->msgno <
=
$to } @refs;
} elsif ($f =~ /^fr/io) {
$f = shift @f;
if ($f) {
} elsif ($f =~ /^fr/io) {
$f = shift @f;
if ($f) {
@@
-64,9
+64,12
@@
while (@f) {
foreach $ref ( @refs) {
Log('msg', "Message $ref->{msgno} from $ref->{from} to $ref->{to} deleted by $call");
if ($full) {
foreach $ref ( @refs) {
Log('msg', "Message $ref->{msgno} from $ref->{from} to $ref->{to} deleted by $call");
if ($full) {
- DX
Prot::broadcast_ak1a(DXProt::pc49($ref->{from}, $ref->{subject}), $DXProt
::me);
+ DX
Channel::broadcast_nodes(DXProt::pc49($ref->{from}, $ref->{subject}), $main
::me);
}
}
- $ref->del_msg;
+ my $tonode = $ref->tonode;
+ $ref->stop_msg($tonode) if $tonode;
+ $ref->delete(1);
+ $ref->deletetime($main::systime + $DXMsg::residencetime);
push @out, $self->msg('m12', $ref->msgno);
}
push @out, $self->msg('m12', $ref->msgno);
}