From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 4A0C32007E for ; Tue, 2 Feb 2021 11:47:03 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 08/16] lib: explicitly distinguish oneshot use Date: Tue, 2 Feb 2021 11:46:54 +0000 Message-Id: <20210202114702.29886-9-e@80x24.org> In-Reply-To: <20210202114702.29886-1-e@80x24.org> References: <20210202114702.29886-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: The daemon must not be fooled into thinking it's in oneshot after a lei client disconnects and erases {sock}. --- lib/PublicInbox/LEI.pm | 23 ++++++++++++++--------- lib/PublicInbox/LeiXSearch.pm | 5 ++--- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index bb7efd59..d6fa814c 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -284,11 +284,13 @@ sub x_it ($$) { dump_and_clear_log(); if (my $sock = $self->{sock}) { send($sock, "x_it $code", MSG_EOR); - } elsif (my $signum = ($code & 127)) { # oneshot, usually SIGPIPE (13) + } elsif (!$self->{oneshot}) { + return; # client disconnected, noop + } elsif (my $signum = ($code & 127)) { # usually SIGPIPE (13) $SIG{PIPE} = 'DEFAULT'; # $SIG{$signum} doesn't work kill $signum, $$; sleep; # wait for signal - } else { # oneshot + } else { # don't want to end up using $? from child processes for my $f (qw(lxs l2m)) { my $wq = delete $self->{$f} or next; @@ -334,10 +336,9 @@ sub child_error { # passes non-fatal curl exit codes to user my ($self, $child_error) = @_; # child_error is $? if (my $sock = $self->{sock}) { # send to lei(1) client send($sock, "child_error $child_error", MSG_EOR); - } else { # oneshot + } elsif ($self->{oneshot}) { $self->{child_error} = $child_error; - } - undef; + } # else noop if client disconnected } sub atfork_prepare_wq { @@ -784,7 +785,7 @@ sub start_mua { push @cmd, $mfolder unless defined($replaced); if (my $sock = $self->{sock}) { # lei(1) client process runs it send($sock, exec_buf(\@cmd, {}), MSG_EOR); - } else { # oneshot + } elsif ($self->{oneshot}) { $self->{"mua.pid.$self.$$"} = spawn(\@cmd); } } @@ -802,13 +803,16 @@ sub start_pager { $new_env->{MORE} = 'FRX' if $^O eq 'freebsd'; pipe(my ($r, $wpager)) or return warn "pipe: $!"; my $rdr = { 0 => $r, 1 => $self->{1}, 2 => $self->{2} }; - my $pgr = [ undef, @$rdr{1, 2}, $$ ]; + my $pgr = [ undef, @$rdr{1, 2} ]; if (my $sock = $self->{sock}) { # lei(1) process runs it delete @$new_env{keys %$env}; # only set iff unset my $fds = [ map { fileno($_) } @$rdr{0..2} ]; $send_cmd->($sock, $fds, exec_buf([$pager], $new_env), MSG_EOR); - } else { + } elsif ($self->{oneshot}) { $pgr->[0] = spawn([$pager], $new_env, $rdr); + $pgr->[3] = $$; # ew'll reap it + } else { + die 'BUG: start_pager w/o socket'; } $self->{1} = $wpager; $self->{2} = $wpager if -t $self->{2}; @@ -823,7 +827,7 @@ sub stop_pager { # do not restore original stdout, just close it so we error out close(delete($self->{1})) if $self->{1}; my $pid = $pgr->[0]; - dwaitpid($pid, undef, $self->{sock}) if $pid && $pgr->[3] == $$; + dwaitpid($pid) if $pid && ($pgr->[3] // 0) == $$; } sub accept_dispatch { # Listener {post_accept} callback @@ -1056,6 +1060,7 @@ sub oneshot { local %PATH2CFG; umask(077) // die("umask(077): $!"); my $self = bless { + oneshot => 1, 0 => *STDIN{GLOB}, 1 => *STDOUT{GLOB}, 2 => *STDERR{GLOB}, diff --git a/lib/PublicInbox/LeiXSearch.pm b/lib/PublicInbox/LeiXSearch.pm index 5cf02136..e997431f 100644 --- a/lib/PublicInbox/LeiXSearch.pm +++ b/lib/PublicInbox/LeiXSearch.pm @@ -409,7 +409,6 @@ sub do_query { fcntl($lei->{startq}, 1031, 4096) if $^O eq 'linux'; $zpipe = $l2m->pre_augment($lei); } - my $in_loop = exists $lei->{sock}; my $ops = { '|' => [ \&sigpipe_handler, $lei ], '!' => [ \&fail_handler, $lei ], @@ -417,7 +416,7 @@ sub do_query { '' => [ \&query_done, $lei ], 'mset_progress' => [ \&mset_progress, $lei ], }; - (my $op, $lei->{pkt_op}) = PublicInbox::PktOp->pair($ops, $in_loop); + (my $op, $lei->{pkt_op}) = PublicInbox::PktOp->pair($ops, !$lei->{oneshot}); my ($lei_ipc, @io) = $lei->atfork_parent_wq($self); delete($lei->{pkt_op}); @@ -428,7 +427,7 @@ sub do_query { } start_query($self, \@io, $lei_ipc); $self->wq_close(1); - unless ($in_loop) { + if ($lei->{oneshot}) { # for the $lei_ipc->atfork_child_wq PIPE handler: while ($op->{sock}) { $op->event_step } }