diff options
author | Eric Wong <e@80x24.org> | 2021-10-14 04:32:55 +0000 |
---|---|---|
committer | Eric Wong <e@80x24.org> | 2021-10-15 02:23:21 +0000 |
commit | 25088c21b46b5d97b29ecb1d25b0342f37133b58 (patch) | |
tree | 73cec51e31de738aff1ccc647f67c0df266f0863 /lib/PublicInbox/LEI.pm | |
parent | ef6d335cb515996c2dd7cc0d9a188f9b041db425 (diff) | |
download | public-inbox-25088c21b46b5d97b29ecb1d25b0342f37133b58.tar.gz |
This lets users Ctrl-Z from their terminal to pause an entire git-clone process hierarchy.
Diffstat (limited to 'lib/PublicInbox/LEI.pm')
-rw-r--r-- | lib/PublicInbox/LEI.pm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index f107c250..9620e264 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -460,9 +460,9 @@ my @WQ_KEYS = qw(lxs l2m ikw pmd wq1 lne); # internal workers sub _drop_wq { my ($self) = @_; for my $wq (grep(defined, delete(@$self{@WQ_KEYS}))) { - if ($wq->wq_kill) { + if ($wq->wq_kill('-TERM')) { $wq->wq_close(0, undef, $self); - } elsif ($wq->wq_kill_old) { + } elsif ($wq->wq_kill_old('-TERM')) { $wq->wq_wait_old(undef, $self); } $wq->DESTROY; @@ -576,6 +576,7 @@ sub _lei_atfork_child { } else { # worker, Net::NNTP (Net::Cmd) uses STDERR directly open STDERR, '+>&='.fileno($self->{2}) or warn "open $!"; STDERR->autoflush(1); + POSIX::setpgid(0, $$) // die "setpgid(0, $$): $!"; } close($_) for (grep(defined, delete @$self{qw(3 old_1 au_done)})); if (my $op_c = delete $self->{pkt_op_c}) { @@ -1148,9 +1149,10 @@ sub event_step { if ($buf eq '') { _drop_wq($self); # EOF, client disconnected dclose($self); - } elsif ($buf =~ /\A(STOP|CONT)\z/) { + } elsif ($buf =~ /\A(?:STOP|CONT)\z/) { + my $sig = "-$buf"; for my $wq (grep(defined, @$self{@WQ_KEYS})) { - $wq->wq_kill($buf) or $wq->wq_kill_old($buf); + $wq->wq_kill($sig) or $wq->wq_kill_old($sig); } } else { die "unrecognized client signal: $buf"; |