X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLEI.pm;h=44afced306f4722ac0d4ed626010cda5ceea26a1;hb=37e2fd40b9d3c37b202a693f6929411bd1064eae;hp=7313738eb3f52aea3e4f2c3740e4c27f400285bd;hpb=3019046b3ab9736922762df111d60ef7647e36a3;p=public-inbox.git diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index 7313738e..44afced3 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -11,21 +11,24 @@ use v5.10.1; use parent qw(PublicInbox::DS PublicInbox::LeiExternal PublicInbox::LeiQuery); use Getopt::Long (); -use Socket qw(AF_UNIX SOCK_STREAM pack_sockaddr_un); -use Errno qw(EAGAIN ECONNREFUSED ENOENT); -use POSIX (); +use Socket qw(AF_UNIX SOCK_SEQPACKET MSG_EOR pack_sockaddr_un); +use Errno qw(EPIPE EAGAIN EINTR ECONNREFUSED ENOENT ECONNRESET); +use Cwd qw(getcwd); +use POSIX qw(strftime); use IO::Handle (); -use Sys::Syslog qw(syslog openlog); +use Fcntl qw(SEEK_SET); use PublicInbox::Config; -use PublicInbox::Syscall qw(SFD_NONBLOCK EPOLLIN EPOLLONESHOT); +use PublicInbox::Syscall qw(SFD_NONBLOCK EPOLLIN EPOLLET); use PublicInbox::Sigfd; use PublicInbox::DS qw(now dwaitpid); -use PublicInbox::Spawn qw(spawn run_die popen_rd); +use PublicInbox::Spawn qw(spawn popen_rd); use PublicInbox::OnDestroy; use Text::Wrap qw(wrap); +use Time::HiRes qw(stat); # ctime comparisons for config cache use File::Path qw(mkpath); use File::Spec; our $quit = \&CORE::exit; +our ($current_lei, $errors_log, $listener); my ($recv_cmd, $send_cmd); my $GLP = Getopt::Long::Parser->new; $GLP->configure(qw(gnu_getopt no_ignore_case auto_abbrev)); @@ -33,7 +36,6 @@ my $GLP_PASS = Getopt::Long::Parser->new; $GLP_PASS->configure(qw(gnu_getopt no_ignore_case auto_abbrev pass_through)); our %PATH2CFG; # persistent for socket daemon -our @TO_CLOSE_ATFORK_CHILD; # TBD: this is a documentation mechanism to show a subcommand # (may) pass options through to another command: @@ -63,18 +65,37 @@ sub opt_dash ($$) { ($spec, '<>' => $cb, $GLP_PASS) # for Getopt::Long } +sub rel2abs ($$) { + my ($self, $p) = @_; + return $p if index($p, '/') == 0; # already absolute + my $pwd = $self->{env}->{PWD}; + if (defined $pwd) { + my $cwd = $self->{3} // getcwd() // die "getcwd(PWD=$pwd): $!"; + if (my @st_pwd = stat($pwd)) { + my @st_cwd = stat($cwd) or die "stat($cwd): $!"; + "@st_pwd[1,0]" eq "@st_cwd[1,0]" or + $self->{env}->{PWD} = $pwd = $cwd; + } else { # PWD was invalid + delete $self->{env}->{PWD}; + undef $pwd; + } + } + $pwd //= $self->{env}->{PWD} = getcwd() // die "getcwd(PWD=$pwd): $!"; + File::Spec->rel2abs($p, $pwd); +} + sub _store_path ($) { - my ($env) = @_; - File::Spec->rel2abs(($env->{XDG_DATA_HOME} // - ($env->{HOME} // '/nonexistent').'/.local/share') - .'/lei/store', $env->{PWD}); + my ($self) = @_; + rel2abs($self, ($self->{env}->{XDG_DATA_HOME} // + ($self->{env}->{HOME} // '/nonexistent').'/.local/share') + .'/lei/store'); } sub _config_path ($) { - my ($env) = @_; - File::Spec->rel2abs(($env->{XDG_CONFIG_HOME} // - ($env->{HOME} // '/nonexistent').'/.config') - .'/lei/config', $env->{PWD}); + my ($self) = @_; + rel2abs($self, ($self->{env}->{XDG_CONFIG_HOME} // + ($self->{env}->{HOME} // '/nonexistent').'/.config') + .'/lei/config'); } # TODO: generate shell completion + help using %CMD and %OPTDESC @@ -82,8 +103,11 @@ sub _config_path ($) { our %CMD = ( # sorted in order of importance/use: 'q' => [ 'SEARCH_TERMS...', 'search for messages matching terms', qw( save-as=s output|mfolder|o=s format|f=s dedupe|d=s thread|t augment|a - sort|s=s reverse|r offset=i remote local! external! pretty - since|after=s until|before=s), opt_dash('limit|n=i', '[0-9]+') ], + sort|s=s reverse|r offset=i remote! local! external! pretty + include|I=s@ exclude=s@ only=s@ + mua-cmd|mua=s no-torsocks torsocks=s verbose|v quiet|q + received-after=s received-before=s sent-after=s sent-since=s), + PublicInbox::LeiQuery::curl_opt(), opt_dash('limit|n=i', '[0-9]+') ], 'show' => [ 'MID|OID', 'show a given object (Message-ID or object ID)', qw(type=s solve! format|f=s dedupe|d=s thread|t remote local!), @@ -94,7 +118,7 @@ our %CMD = ( # sorted in order of importance/use: qw(boost=i quiet|q) ], 'ls-external' => [ '[FILTER...]', 'list publicinbox|extindex locations', qw(format|f=s z|0 local remote quiet|q) ], -'forget-external' => [ '{URL_OR_PATHNAME|--prune}', +'forget-external' => [ 'URL_OR_PATHNAME...|--prune', 'exclude further results from a publicinbox|extindex', qw(prune quiet|q) ], @@ -113,7 +137,7 @@ our %CMD = ( # sorted in order of importance/use: "exclude message(s) on stdin from `q' search results", qw(stdin| oid=s exact by-mid|mid:s quiet|q) ], -'purge-mailsource' => [ '{URL_OR_PATHNAME|--all}', +'purge-mailsource' => [ 'URL_OR_PATHNAME|--all', 'remove imported messages from IMAP, Maildirs, and MH', qw(exact! all jobs:i indexed) ], @@ -136,7 +160,7 @@ our %CMD = ( # sorted in order of importance/use: 'forget-watch' => [ '{WATCH_NUMBER|--prune}', 'stop and forget a watch', qw(prune) ], -'import' => [ '{URL_OR_PATHNAME|--stdin}', +'import' => [ 'URL_OR_PATHNAME|--stdin', 'one-shot import/update from URL or filesystem', qw(stdin| offset=i recursive|r exclude=s include=s !flags), ], @@ -177,7 +201,11 @@ my $ls_format = [ 'OUT|plain|json|null', 'listing output format' ]; my %OPTDESC = ( 'help|h' => 'show this built-in help', 'quiet|q' => 'be quiet', +'verbose|v' => 'be more verbose', 'solve!' => 'do not attempt to reconstruct blobs from emails', +'torsocks=s' => ['auto|no|yes', + 'whether or not to wrap git and curl commands with torsocks'], +'no-torsocks' => 'alias for --torsocks=no', 'save-as=s' => ['NAME', 'save a search terms by given name'], 'type=s' => [ 'any|mid|git', 'disambiguate type' ], @@ -189,15 +217,25 @@ my %OPTDESC = ( 'return all messages in the same thread as the actual match(es)', 'augment|a' => 'augment --output destination instead of clobbering', -'output|o=s' => [ 'DEST', +'output|mfolder|o=s' => [ 'DEST', "destination (e.g. `/path/to/Maildir', or `-' for stdout)" ], +'mua-cmd|mua=s' => [ 'COMMAND', + "MUA to run on --output Maildir or mbox (e.g. `mutt -f %f'" ], 'show format|f=s' => [ 'OUT|plain|raw|html|mboxrd|mboxcl2|mboxcl', 'message/object output format' ], 'mark format|f=s' => $stdin_formats, 'forget format|f=s' => $stdin_formats, -'q format|f=s' => [ 'OUT|maildir|mboxrd|mboxcl2|mboxcl|html|oid|json', +'q format|f=s' => [ + 'OUT|maildir|mboxrd|mboxcl2|mboxcl|mboxo|html|json|jsonl|concatjson', 'specify output format, default depends on --output'], +'q exclude=s@' => [ 'URL_OR_PATHNAME', + 'exclude specified external(s) from search' ], +'q include|I=s@' => [ 'URL_OR_PATHNAME', + 'include specified external(s) in search' ], +'q only=s@' => [ 'URL_OR_PATHNAME', + 'only use specified external(s) for search' ], + 'ls-query format|f=s' => $ls_format, 'ls-external format|f=s' => $ls_format, @@ -238,72 +276,159 @@ my %CONFIG_KEYS = ( 'leistore.dir' => 'top-level storage location', ); -sub x_it ($$) { # pronounced "exit" +# pronounced "exit": x_it(1 << 8) => exit(1); x_it(13) => SIGPIPE +sub x_it ($$) { my ($self, $code) = @_; - $self->{1}->autoflush(1); # make sure client sees stdout before exit - my $sig = ($code & 127); - $code >>= 8 unless $sig; + # make sure client sees stdout before exit + $self->{1}->autoflush(1) if $self->{1}; + dump_and_clear_log(); if (my $sock = $self->{sock}) { - my $fds = [ map { fileno($_) } @$self{0..2} ]; - $send_cmd->($sock, $fds, "exit=$code\n", 0); - } else { # for oneshot - $quit->($code); - } + send($sock, "x_it $code", MSG_EOR); + } elsif ($self->{oneshot}) { + # don't want to end up using $? from child processes + for my $f (qw(lxs l2m)) { + my $wq = delete $self->{$f} or next; + $wq->DESTROY; + } + # cleanup anything that has tempfiles + delete @$self{qw(ovv dedupe)}; + if (my $signum = ($code & 127)) { # usually SIGPIPE (13) + $SIG{PIPE} = 'DEFAULT'; # $SIG{$signum} doesn't work + kill $signum, $$; + sleep; # wait for signal + } else { + $quit->($code >> 8); + } + } # else ignore if client disconnected } -sub puts ($;@) { print { shift->{1} } map { "$_\n" } @_ } - -sub out ($;@) { print { shift->{1} } @_ } - sub err ($;@) { - print { shift->{2} } @_, (substr($_[-1], -1, 1) eq "\n" ? () : "\n"); + my $self = shift; + my $err = $self->{2} // ($self->{pgr} // [])->[2] // *STDERR{GLOB}; + my $eor = (substr($_[-1], -1, 1) eq "\n" ? () : "\n"); + print $err @_, $eor and return; + my $old_err = delete $self->{2}; + close($old_err) if $! == EPIPE && $old_err;; + $err = $self->{2} = ($self->{pgr} // [])->[2] // *STDERR{GLOB}; + print $err @_, $eor or print STDERR @_, $eor; } sub qerr ($;@) { $_[0]->{opt}->{quiet} or err(shift, @_) } sub fail ($$;$) { my ($self, $buf, $exit_code) = @_; - err($self, $buf); + err($self, $buf) if defined $buf; + send($self->{pkt_op}, '!', MSG_EOR) if $self->{pkt_op}; # fail_handler x_it($self, ($exit_code // 1) << 8); undef; } +sub out ($;@) { + my $self = shift; + return if print { $self->{1} // return } @_; # likely + return note_sigpipe($self, 1) if $! == EPIPE; + my $err = "error writing to stdout: $!"; + delete $self->{1}; + fail($self, $err); +} + +sub puts ($;@) { out(shift, map { "$_\n" } @_) } + +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); + } elsif ($self->{oneshot}) { + $self->{child_error} = $child_error; + } # else noop if client disconnected +} + sub atfork_prepare_wq { my ($self, $wq) = @_; - push @{$wq->{-ipc_atfork_child_close}}, @TO_CLOSE_ATFORK_CHILD, - grep { defined } @$self{qw(0 1 2 sock)} + my $tcafc = $wq->{-ipc_atfork_child_close} //= [ $listener // () ]; + if (my $sock = $self->{sock}) { + push @$tcafc, @$self{qw(0 1 2 3)}, $sock; + } + if (my $pgr = $self->{pgr}) { + push @$tcafc, @$pgr[1,2]; + } + if (my $old_1 = $self->{old_1}) { + push @$tcafc, $old_1; + } + for my $f (qw(lxs l2m)) { + my $ipc = $self->{$f} or next; + push @$tcafc, grep { defined } + @$ipc{qw(-wq_s1 -wq_s2 -ipc_req -ipc_res)}; + } +} + +sub io_restore ($$) { + my ($dst, $src) = @_; + for my $i (0..2) { # standard FDs + my $io = delete $src->{$i} or next; + $dst->{$i} = $io; + } + for my $i (3..9) { # named (non-standard) FDs + my $io = $src->{$i} or next; + my @st = stat($io) or die "stat $src.$i ($io): $!"; + my $f = delete $dst->{"dev=$st[0],ino=$st[1]"} // next; + $dst->{$f} = $io; + delete $src->{$i}; + } +} + +sub note_sigpipe { # triggers sigpipe_handler + my ($self, $fd) = @_; + close(delete($self->{$fd})); # explicit close silences Perl warning + send($self->{pkt_op}, '|', MSG_EOR) if $self->{pkt_op}; + x_it($self, 13); } -# usage: local %SIG = (%SIG, $lei->atfork_child_wq($wq)); sub atfork_child_wq { my ($self, $wq) = @_; - return () if $self->{0}; # did not fork - $self->{$_} = $wq->{$_} for (0..2); - $self->{sock} = $wq->{3} // die 'BUG: no {sock}'; # may be undef - my $oldpipe = $SIG{PIPE}; + io_restore($self, $wq); + -S $self->{pkt_op} or die 'BUG: {pkt_op} expected'; + io_restore($self->{l2m}, $wq); %PATH2CFG = (); - @TO_CLOSE_ATFORK_CHILD = (); - ( - __WARN__ => sub { err($self, @_) }, - PIPE => sub { - $self->x_it(141); - $oldpipe->() if ref($oldpipe) eq 'CODE'; - } - ); + undef $errors_log; + $quit = \&CORE::exit; + $current_lei = $self; # for SIG{__WARN__} +} + +sub io_extract ($;@) { + my ($obj, @fields) = @_; + my @io; + for my $f (@fields) { + my $io = delete $obj->{$f} or next; + my @st = stat($io) or die "W: stat $obj.$f ($io): $!"; + $obj->{"dev=$st[0],ino=$st[1]"} = $f; + push @io, $io; + } + @io } # usage: ($lei, @io) = $lei->atfork_parent_wq($wq); sub atfork_parent_wq { my ($self, $wq) = @_; - if ($wq->wq_workers) { - my $env = delete $self->{env}; # env is inherited at fork - my $ret = bless { %$self }, ref($self); - $self->{env} = $env; - delete @$ret{qw(-lei_store cfg pgr)}; - ($ret, delete @$ret{qw(0 1 2 sock)}); - } else { - ($self, @$self{qw(0 1 2 sock)}); + my $env = delete $self->{env}; # env is inherited at fork + my $lei = bless { %$self }, ref($self); + for my $f (qw(dedupe ovv)) { + my $tmp = delete($lei->{$f}) or next; + $lei->{$f} = $wq->deep_clone($tmp); + } + $self->{env} = $env; + delete @$lei{qw(3 -lei_store cfg old_1 pgr lxs)}; # keep l2m + my @io = (delete(@$lei{qw(0 1 2)}), + io_extract($lei, qw(sock pkt_op startq))); + my $l2m = $lei->{l2m}; + if ($l2m && $l2m != $wq) { # $wq == lxs + if (my $wq_s1 = $l2m->{-wq_s1}) { + push @io, io_extract($l2m, '-wq_s1'); + $l2m->{-wq_s1} = $wq_s1; + } + $l2m->wq_close(1); } + ($lei, @io); } sub _help ($;$) { @@ -312,7 +437,7 @@ sub _help ($;$) { my @info = @{$CMD{$cmd} // [ '...', '...' ]}; my @top = ($cmd, shift(@info) // ()); my $cmd_desc = shift(@info); - $cmd_desc = $cmd_desc->($self->{env}) if ref($cmd_desc) eq 'CODE'; + $cmd_desc = $cmd_desc->($self) if ref($cmd_desc) eq 'CODE'; my @opt_desc; my $lpad = 2; for my $sw (grep { !ref } @info) { # ("prio=s", "z", $GLP_PASS) @@ -434,6 +559,7 @@ sub optparse ($$$) { last; } # else continue looping } + last if $ok; my $last = pop @or; $err = join(', ', @or) . " or $last must be set"; } else { @@ -449,7 +575,8 @@ sub optparse ($$$) { sub dispatch { my ($self, $cmd, @argv) = @_; - local $SIG{__WARN__} = sub { err($self, @_) }; + local $current_lei = $self; # for __WARN__ + dump_and_clear_log("from previous run\n"); return _help($self, 'no command given') unless defined($cmd); my $func = "lei_$cmd"; $func =~ tr/-/_/; @@ -468,7 +595,7 @@ sub dispatch { sub _lei_cfg ($;$) { my ($self, $creat) = @_; - my $f = _config_path($self->{env}); + my $f = _config_path($self); my @st = stat($f); my $cur_st = @st ? pack('dd', $st[10], $st[7]) : ''; # 10:ctime, 7:size if (my $cfg = $PATH2CFG{$f}) { # reuse existing object in common case @@ -498,8 +625,7 @@ sub _lei_store ($;$) { $cfg->{-lei_store} //= do { require PublicInbox::LeiStore; my $dir = $cfg->{'leistore.dir'}; - $dir //= _store_path($self->{env}) if $creat; - return unless $dir; + $dir //= $creat ? _store_path($self) : return; PublicInbox::LeiStore->new($dir, { creat => $creat }); }; } @@ -512,25 +638,31 @@ sub lei_mark { my ($self, @argv) = @_; } -sub lei_config { +sub _config { my ($self, @argv) = @_; - $self->{opt}->{'config-file'} and return fail $self, - "config file switches not supported by `lei config'"; my $env = $self->{env}; delete local $env->{GIT_CONFIG}; + delete local $ENV{GIT_CONFIG}; my $cfg = _lei_cfg($self, 1); my $cmd = [ qw(git config -f), $cfg->{'-f'}, @argv ]; my %rdr = map { $_ => $self->{$_} } (0..2); - run_die($cmd, $env, \%rdr); + waitpid(spawn($cmd, $env, \%rdr), 0); +} + +sub lei_config { + my ($self, @argv) = @_; + $self->{opt}->{'config-file'} and return fail $self, + "config file switches not supported by `lei config'"; + _config(@_); + x_it($self, $?) if $?; } sub lei_init { my ($self, $dir) = @_; my $cfg = _lei_cfg($self, 1); my $cur = $cfg->{'leistore.dir'}; - my $env = $self->{env}; - $dir //= _store_path($env); - $dir = File::Spec->rel2abs($dir, $env->{PWD}); # PWD is symlink-aware + $dir //= _store_path($self); + $dir = rel2abs($self, $dir); my @cur = stat($cur) if defined($cur); $cur = File::Spec->canonpath($cur // $dir); my @dir = stat($dir); @@ -542,7 +674,7 @@ sub lei_init { } # some folks like symlinks and bind mounts :P - if (@dir && "$cur[0] $cur[1]" eq "$dir[0] $dir[1]") { + if (@dir && "@cur[1,0]" eq "@dir[1,0]") { lei_config($self, 'leistore.dir', $dir); _lei_store($self, 1)->done; return qerr($self, "$exists (as $cur)"); @@ -596,36 +728,68 @@ sub lei__complete { get-color-name get-colorbool); # fall-through } - # TODO: arg support puts $self, grep(/$re/, map { # generate short/long names - my $eq = ''; - if (s/=.+\z//) { # required arg, e.g. output|o=i - $eq = '='; - } elsif (s/:.+\z//) { # optional arg, e.g. mid:s + if (s/[:=].+\z//) { # req/optional args, e.g output|o=i } else { # negation: solve! => no-solve|solve s/\A(.+)!\z/no-$1|$1/; } map { - length > 1 ? "--$_$eq" : "-$_" + my $x = length > 1 ? "--$_" : "-$_"; + $x eq $cur ? () : $x; } split(/\|/, $_, -1) # help|h } grep { $OPTDESC{"$cmd\t$_"} || $OPTDESC{$_} } @spec); } elsif ($cmd eq 'config' && !@argv && !$CONFIG_KEYS{$cur}) { puts $self, grep(/$re/, keys %CONFIG_KEYS); } + + # switch args (e.g. lei q -f mbox) + if (($argv[-1] // $cur // '') =~ /\A--?([\w\-]+)\z/) { + my $opt = quotemeta $1; + puts $self, map { + my $v = $OPTDESC{$_}; + my @v = ref($v) ? split(/\|/, $v->[0]) : (); + # get rid of ALL CAPS placeholder (e.g "OUT") + # (TODO: completion for external paths) + shift(@v) if uc($v[0]) eq $v[0]; + @v; + } grep(/\A(?:$cmd\t|)(?:[\w-]+\|)*$opt\b/, keys %OPTDESC); + } + $cmd =~ tr/-/_/; + if (my $sub = $self->can("_complete_$cmd")) { + puts $self, $sub->($self, @argv, $cur); + } # TODO: URLs, pathnames, OIDs, MIDs, etc... See optparse() for # proto parsing. } -sub reap_exec { # dwaitpid callback - my ($self, $pid) = @_; - x_it($self, $?); +sub exec_buf ($$) { + my ($argv, $env) = @_; + my $argc = scalar @$argv; + my $buf = 'exec '.join("\0", scalar(@$argv), @$argv); + while (my ($k, $v) = each %$env) { $buf .= "\0$k=$v" }; + $buf; } -sub lei_git { # support passing through random git commands - my ($self, @argv) = @_; - my %rdr = map { $_ => $self->{$_} } (0..2); - my $pid = spawn(['git', @argv], $self->{env}, \%rdr); - dwaitpid($pid, \&reap_exec, $self); +sub start_mua { + my ($self) = @_; + my $mua = $self->{opt}->{'mua-cmd'} // return; + my $mfolder = $self->{ovv}->{dst}; + my (@cmd, $replaced); + if ($mua =~ /\A(?:mutt|mailx|mail|neomutt)\z/) { + @cmd = ($mua, '-f'); + # TODO: help wanted: other common FOSS MUAs + } else { + require Text::ParseWords; + my @cmd = Text::ParseWords::shellwords($mua); + # mutt uses '%f' for open-hook with compressed mbox, we follow + @cmd = map { $_ eq '%f' ? ($replaced = $mfolder) : $_ } @cmd; + } + push @cmd, $mfolder unless defined($replaced); + if (my $sock = $self->{sock}) { # lei(1) client process runs it + send($sock, exec_buf(\@cmd, {}), MSG_EOR); + } elsif ($self->{oneshot}) { + $self->{"mua.pid.$self.$$"} = spawn(\@cmd); + } } # caller needs to "-t $self->{1}" to check if tty @@ -637,19 +801,20 @@ sub start_pager { close($fh) or warn "`git var PAGER' error: \$?=$?"; return if $pager eq 'cat' || $pager eq ''; # TODO TIOCGWINSZ - my %new_env = (LESS => 'FRX', LV => '-c', COLUMNS => 80); - $new_env{MORE} = 'FRX' if $^O eq 'freebsd'; + my $new_env = { LESS => 'FRX', LV => '-c', COLUMNS => 80 }; + $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} ]; if (my $sock = $self->{sock}) { # lei(1) process runs it - delete @new_env{keys %$env}; # only set iff unset - my $buf = "exec 1\0".$pager; - while (my ($k, $v) = each %new_env) { $buf .= "\0$k=$v" }; + delete @$new_env{keys %$env}; # only set iff unset my $fds = [ map { fileno($_) } @$rdr{0..2} ]; - $send_cmd->($sock, $fds, $buf .= "\n", 0); + $send_cmd->($sock, $fds, exec_buf([$pager], $new_env), MSG_EOR); + } elsif ($self->{oneshot}) { + $pgr->[0] = spawn([$pager], $new_env, $rdr); + $pgr->[3] = $$; # ew'll reap it } else { - $pgr->[0] = spawn([$pager], $env, $rdr); + die 'BUG: start_pager w/o socket'; } $self->{1} = $wpager; $self->{2} = $wpager if -t $self->{2}; @@ -660,71 +825,95 @@ sub start_pager { sub stop_pager { my ($self) = @_; my $pgr = delete($self->{pgr}) or return; - my $pid = $pgr->[0]; - close $self->{1}; - # {2} may not be redirected - $self->{1} = $pgr->[1]; $self->{2} = $pgr->[2]; - dwaitpid($pid, undef, $self->{sock}) if $pid; + # 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) if $pid && ($pgr->[3] // 0) == $$; } sub accept_dispatch { # Listener {post_accept} callback my ($sock) = @_; # ignore other - $sock->blocking(1); $sock->autoflush(1); my $self = bless { sock => $sock }, __PACKAGE__; - vec(my $rin = '', fileno($sock), 1) = 1; - # `say $sock' triggers "die" in lei(1) - my $buf; - if (select(my $rout = $rin, undef, undef, 1)) { - my @fds = $recv_cmd->($sock, $buf, 4096 * 33); # >MAX_ARG_STRLEN - if (scalar(@fds) == 3) { - my $i = 0; - for my $rdr (qw(<&= >&= >&=)) { - my $fd = shift(@fds); - if (open(my $fh, $rdr, $fd)) { - $self->{$i++} = $fh; - } else { - say $sock "open($rdr$fd) (FD=$i): $!"; - return; - } - } - } else { - say $sock "recv_cmd failed: $!"; - return; + vec(my $rvec = '', fileno($sock), 1) = 1; + select($rvec, undef, undef, 60) or + return send($sock, 'timed out waiting to recv FDs', MSG_EOR); + my @fds = $recv_cmd->($sock, my $buf, 4096 * 33); # >MAX_ARG_STRLEN + if (scalar(@fds) == 4) { + for my $i (0..3) { + my $fd = shift(@fds); + open($self->{$i}, '+<&=', $fd) and next; + send($sock, "open(+<&=$fd) (FD=$i): $!", MSG_EOR); } } else { - say $sock "timed out waiting to recv FDs"; - return; + my $msg = "recv_cmd failed: $!"; + warn $msg; + return send($sock, $msg, MSG_EOR); } $self->{2}->autoflush(1); # keep stdout buffered until x_it|DESTROY # $ENV_STR = join('', map { "\0$_=$ENV{$_}" } keys %ENV); - # $buf = "$$\0$argc\0".join("\0", @ARGV).$ENV_STR."\0\0"; - if (substr($buf, -2, 2, '') ne "\0\0") { # s/\0\0\z// - say $sock "request command truncated"; - return; - } + # $buf = "$argc\0".join("\0", @ARGV).$ENV_STR."\0\0"; + substr($buf, -2, 2, '') eq "\0\0" or # s/\0\0\z// + return send($sock, 'request command truncated', MSG_EOR); my ($argc, @argv) = split(/\0/, $buf, -1); undef $buf; my %env = map { split(/=/, $_, 2) } splice(@argv, $argc); - if (chdir($env{PWD})) { + if (chdir($self->{3})) { local %ENV = %env; $self->{env} = \%env; eval { dispatch($self, @argv) }; - say $sock $@ if $@; + send($sock, $@, MSG_EOR) if $@; } else { - say $sock "chdir($env{PWD}): $!"; # implicit close + send($sock, "fchdir: $!", MSG_EOR); # implicit close + } +} + +sub dclose { + my ($self) = @_; + for my $f (qw(lxs l2m)) { + my $wq = delete $self->{$f} or next; + if ($wq->wq_kill) { + $wq->wq_close + } elsif ($wq->wq_kill_old) { + $wq->wq_wait_old($self); + } } + close(delete $self->{1}) if $self->{1}; # may reap_compress + $self->close if $self->{sock}; # PublicInbox::DS::close } # for long-running results sub event_step { my ($self) = @_; local %ENV = %{$self->{env}}; - eval {}; # TODO - if ($@) { - say { $self->{sock} } $@; - $self->close; # PublicInbox::DS::close + my $sock = $self->{sock}; + local $current_lei = $self; + eval { + while (my @fds = $recv_cmd->($sock, my $buf, 4096)) { + if (scalar(@fds) == 1 && !defined($fds[0])) { + return if $! == EAGAIN; + next if $! == EINTR; + last if $! == ECONNRESET; + die "recvmsg: $!"; + } + for my $fd (@fds) { + open my $rfh, '+<&=', $fd; + } + die "unrecognized client signal: $buf"; + } + dclose($self); + }; + if (my $err = $@) { + eval { $self->fail($err) }; + dclose($self); + } +} + +sub event_step_init { + my ($self) = @_; + if (my $sock = $self->{sock}) { # using DS->EventLoop + $self->SUPER::new($sock, EPOLLIN|EPOLLET); } } @@ -732,24 +921,38 @@ sub noop {} our $oldset; sub oldset { $oldset } +sub dump_and_clear_log { + if (defined($errors_log) && -s STDIN && seek(STDIN, 0, SEEK_SET)) { + my @pfx = @_; + unshift(@pfx, "$errors_log ") if @pfx; + warn @pfx, do { local $/; }; + truncate(STDIN, 0) or warn "ftruncate ($errors_log): $!"; + } +} + # lei(1) calls this when it can't connect sub lazy_start { - my ($path, $errno, $nfd) = @_; + my ($path, $errno, $narg) = @_; if ($errno == ECONNREFUSED) { unlink($path) or die "unlink($path): $!"; } elsif ($errno != ENOENT) { $! = $errno; # allow interpolation to stringify in die die "connect($path): $!"; } + if (eval { require BSD::Resource }) { + my $NOFILE = BSD::Resource::RLIMIT_NOFILE(); + my ($s, $h) = BSD::Resource::getrlimit($NOFILE); + BSD::Resource::setrlimit($NOFILE, $h, $h) if $s < $h; + } umask(077) // die("umask(077): $!"); - socket(my $l, AF_UNIX, SOCK_STREAM, 0) or die "socket: $!"; - bind($l, pack_sockaddr_un($path)) or die "bind($path): $!"; - listen($l, 1024) or die "listen: $!"; + local $listener; + socket($listener, AF_UNIX, SOCK_SEQPACKET, 0) or die "socket: $!"; + bind($listener, pack_sockaddr_un($path)) or die "bind($path): $!"; + listen($listener, 1024) or die "listen: $!"; my @st = stat($path) or die "stat($path): $!"; my $dev_ino_expect = pack('dd', $st[0], $st[1]); # dev+ino - pipe(my ($eof_r, $eof_w)) or die "pipe: $!"; local $oldset = PublicInbox::DS::block_signals(); - if ($nfd == 4) { + if ($narg == 5) { $send_cmd = PublicInbox::Spawn->can('send_cmd4'); $recv_cmd = PublicInbox::Spawn->can('recv_cmd4') // do { require PublicInbox::CmdIPC4; @@ -758,31 +961,37 @@ sub lazy_start { }; } $recv_cmd or die <<""; -(Socket::MsgHdr || Inline::C) missing/unconfigured (nfd=$nfd); +(Socket::MsgHdr || Inline::C) missing/unconfigured (narg=$narg); require PublicInbox::Listener; require PublicInbox::EOFpipe; (-p STDOUT) or die "E: stdout must be a pipe\n"; - open(STDIN, '+<', '/dev/null') or die "redirect stdin failed: $!"; + local $errors_log; + ($errors_log) = ($path =~ m!\A(.+?/)[^/]+\z!); + $errors_log .= 'errors.log'; + open(STDIN, '+>>', $errors_log) or die "open($errors_log): $!"; + STDIN->autoflush(1); + dump_and_clear_log("from previous daemon process:\n"); POSIX::setsid() > 0 or die "setsid: $!"; my $pid = fork // die "fork: $!"; return if $pid; $0 = "lei-daemon $path"; local %PATH2CFG; - local @TO_CLOSE_ATFORK_CHILD = ($l, $eof_r, $eof_w); - $_->blocking(0) for ($l, $eof_r, $eof_w); - $l = PublicInbox::Listener->new($l, \&accept_dispatch, $l); + $listener->blocking(0); my $exit_code; - local $quit = sub { - $exit_code //= shift; - my $listener = $l or exit($exit_code); - unlink($path) if defined($path); - # closing eof_w triggers \&noop wakeup - $eof_w = $l = $path = undef; - $listener->close; # DS::close - PublicInbox::DS->SetLoopTimeout(1000); + my $pil = PublicInbox::Listener->new($listener, \&accept_dispatch); + local $quit = do { + pipe(my ($eof_r, $eof_w)) or die "pipe: $!"; + PublicInbox::EOFpipe->new($eof_r, \&noop, undef); + sub { + $exit_code //= shift; + my $lis = $pil or exit($exit_code); + # closing eof_w triggers \&noop wakeup + $listener = $eof_w = $pil = $path = undef; + $lis->close; # DS::close + PublicInbox::DS->SetLoopTimeout(1000); + }; }; - PublicInbox::EOFpipe->new($eof_r, \&noop, undef); my $sig = { CHLD => \&PublicInbox::DS::enqueue_reap, QUIT => $quit, @@ -793,10 +1002,11 @@ sub lazy_start { USR2 => \&noop, }; my $sigfd = PublicInbox::Sigfd->new($sig, SFD_NONBLOCK); - local %SIG = (%SIG, %$sig) if !$sigfd; + local @SIG{keys %$sig} = values(%$sig) unless $sigfd; + undef $sig; local $SIG{PIPE} = 'IGNORE'; if ($sigfd) { # TODO: use inotify/kqueue to detect unlinked sockets - push @TO_CLOSE_ATFORK_CHILD, $sigfd->{sock}; + undef $sigfd; PublicInbox::DS->SetLoopTimeout(5000); } else { # wake up every second to accept signals if we don't @@ -811,9 +1021,9 @@ sub lazy_start { warn "$path dev/ino changed, quitting\n"; $path = undef; } - } elsif (defined($path)) { - warn "stat($path): $!, quitting ...\n"; - undef $path; # don't unlink + } elsif (defined($path)) { # ENOENT is common + warn "stat($path): $!, quitting ...\n" if $! != ENOENT; + undef $path; $quit->(); } return 1 if defined($path); @@ -833,45 +1043,44 @@ sub lazy_start { # STDIN was redirected to /dev/null above, closing STDERR and # STDOUT will cause the calling `lei' client process to finish # reading the <$daemon> pipe. - openlog($path, 'pid', 'user'); - local $SIG{__WARN__} = sub { syslog('warning', "@_") }; - my $on_destroy = PublicInbox::OnDestroy->new($$, sub { - syslog('crit', "$@") if $@; - }); + local $SIG{__WARN__} = sub { + $current_lei ? err($current_lei, @_) : warn( + strftime('%Y-%m-%dT%H:%M:%SZ', gmtime(time))," $$ ", @_); + }; open STDERR, '>&STDIN' or die "redirect stderr failed: $!"; open STDOUT, '>&STDIN' or die "redirect stdout failed: $!"; # $daemon pipe to `lei' closed, main loop begins: PublicInbox::DS->EventLoop; - @$on_destroy = (); # cancel on_destroy if we get here exit($exit_code // 0); } -# for users w/o Socket::Msghdr +# for users w/o Socket::Msghdr installed or Inline::C enabled sub oneshot { my ($main_pkg) = @_; my $exit = $main_pkg->can('exit'); # caller may override exit() local $quit = $exit if $exit; local %PATH2CFG; umask(077) // die("umask(077): $!"); - local $SIG{PIPE} = sub { die(bless(\"$_[0]", 'PublicInbox::SIGPIPE')) }; - eval { - my $self = bless { - 0 => *STDIN{GLOB}, - 1 => *STDOUT{GLOB}, - 2 => *STDERR{GLOB}, - env => \%ENV - }, __PACKAGE__; - dispatch($self, @ARGV); - }; - die $@ if $@ && ref($@) ne 'PublicInbox::SIGPIPE'; + my $self = bless { + oneshot => 1, + 0 => *STDIN{GLOB}, + 1 => *STDOUT{GLOB}, + 2 => *STDERR{GLOB}, + env => \%ENV + }, __PACKAGE__; + dispatch($self, @ARGV); + x_it($self, $self->{child_error}) if $self->{child_error}; } # ensures stdout hits the FS before sock disconnects so a client # can immediately reread it sub DESTROY { my ($self) = @_; - $self->{1}->autoflush(1); + $self->{1}->autoflush(1) if $self->{1}; stop_pager($self); + if (my $mua_pid = delete $self->{"mua.pid.$self.$$"}) { + waitpid($mua_pid, 0); + } } 1;