lei: get rid of client {pid} field

[public-inbox.git] / script / lei

diff --git a/script/lei b/script/lei
index 029881f8a70d1cdcda66b4c17c55cfb1a9e47590..bea06b2c0f6edbe4ce5bc810c62bb26c76e0451c 100755 (executable)
--- a/script/lei
+++ b/script/lei
@@ -4,11 +4,20 @@
 use strict;
 use v5.10.1;
 use Socket qw(AF_UNIX SOCK_STREAM pack_sockaddr_un);
-my $send_3fds;
-if (my ($sock, $pwd) = eval {
-       require PublicInbox::Spawn;
-       $send_3fds = PublicInbox::Spawn->can('send_3fds') or die
-               "Inline::C not installed/configured or IO::FDPass missing\n";
+use PublicInbox::CmdIPC4;
+my $narg = 4;
+my $send_cmd = PublicInbox::CmdIPC4->can('send_cmd4') // do {
+       require PublicInbox::CmdIPC1; # 2nd choice
+       $narg = 1;
+       PublicInbox::CmdIPC1->can('send_cmd1');
+} // do {
+       require PublicInbox::Spawn; # takes ~50ms even if built *sigh*
+       $narg = 4;
+       PublicInbox::Spawn->can('send_cmd4');
+};
+
+my ($sock, $pwd);
+if ($send_cmd && eval {
        my $path = do {
                my $runtime_dir = ($ENV{XDG_RUNTIME_DIR} // '') . '/lei';
                if ($runtime_dir eq '/lei') {
@@ -19,29 +28,27 @@ if (my ($sock, $pwd) = eval {
                        require File::Path;
                        File::Path::mkpath($runtime_dir, 0, 0700);
                }
-               "$runtime_dir/sock";
+               "$runtime_dir/$narg.sock";
        };
        my $addr = pack_sockaddr_un($path);
-       socket(my $sock, AF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
+       socket($sock, AF_UNIX, SOCK_STREAM, 0) or die "socket: $!";
        unless (connect($sock, $addr)) { # start the daemon if not started
                local $ENV{PERL5LIB} = join(':', @INC);
                open(my $daemon, '-|', $^X, qw[-MPublicInbox::LEI
                        -E PublicInbox::LEI::lazy_start(@ARGV)],
-                       $path, $! + 0) or die "popen: $!";
+                       $path, $! + 0, $narg) or die "popen: $!";
                while (<$daemon>) { warn $_ } # EOF when STDERR is redirected
                close($daemon) or warn <<"";
 lei-daemon could not start, exited with \$?=$?
 
                # try connecting again anyways, unlink+bind may be racy
-               unless (connect($sock, $addr)) {
-                       die <<"";
+               connect($sock, $addr) or die <<"";
 connect($path): $! (after attempted daemon start)
 Falling back to (slow) one-shot mode
 
-               }
        }
        require Cwd;
-       my $pwd = $ENV{PWD} // '';
+       $pwd = $ENV{PWD} // '';
        my $cwd = Cwd::fastcwd() // die "fastcwd(PWD=$pwd): $!";
        if ($pwd ne $cwd) { # prefer ENV{PWD} if it's a symlink to real cwd
                my @st_cwd = stat($cwd) or die "stat(cwd=$cwd): $!";
@@ -52,23 +59,21 @@ Falling back to (slow) one-shot mode
        } else {
                $pwd = $cwd;
        }
-       ($sock, $pwd);
-}) { # IO::FDPass, $sock, $pwd are all available:
+       1;
+}) { # (Socket::MsgHdr|IO::FDPass|Inline::C), $sock, $pwd are all available:
        local $ENV{PWD} = $pwd;
-       my $buf = "$$\0\0>" . join("]\0[", @ARGV) . "\0\0>";
-       while (my ($k, $v) = each %ENV) { $buf .= "$k=$v\0" }
+       my $buf = join("\0", scalar(@ARGV), @ARGV);
+       while (my ($k, $v) = each %ENV) { $buf .= "\0$k=$v" }
        $buf .= "\0\0";
        select $sock;
        $| = 1; # unbuffer selected $sock
-       $send_3fds->(fileno($sock), 0, 1, 2);
-       print $sock $buf or die "print(sock, buf): $!";
+       $send_cmd->($sock, [ 0, 1, 2 ], $buf, 0);
        while ($buf = <$sock>) {
                $buf =~ /\Aexit=([0-9]+)\n\z/ and exit($1 + 0);
                die $buf;
        }
-} else { # for systems lacking IO::FDPass
-       # don't warn about IO::FDPass since it's not commonly installed
-       warn $@ if $@ && index($@, 'IO::FDPass') < 0;
+} else { # for systems lacking Socket::MsgHdr, IO::FDPass or Inline::C
+       warn $@ if $@;
        require PublicInbox::LEI;
        PublicInbox::LEI::oneshot(__PACKAGE__);
 }