nntp: resolve inboxes immediately on group listings

[public-inbox.git] / lib / PublicInbox / LeiSucks.pm

diff --git a/lib/PublicInbox/LeiSucks.pm b/lib/PublicInbox/LeiSucks.pm
index d364a856d2415a59a47cb62ab5e8efe523a2fb8f..8e866fc96655a9dd5a6342de43217da0a57e14f5 100644 (file)
--- a/lib/PublicInbox/LeiSucks.pm
+++ b/lib/PublicInbox/LeiSucks.pm
@@ -11,21 +11,22 @@ use Digest::SHA ();
 use Config;
 use POSIX ();
 use PublicInbox::Config;
-use PublicInbox::Search;
+use PublicInbox::IPC;
 
 sub lei_sucks {
        my ($lei, @argv) = @_;
        $lei->start_pager if -t $lei->{1};
        my ($os, undef, $rel, undef, $mac)= POSIX::uname();
        if ($mac eq 'x86_64' && $Config{ptrsize} == 4) {
-               $mac = $Config{cppsymbols} =~ /\b__ILP32__=1\b/ ? 'x32' : 'i386'
+               $mac .= $Config{cppsymbols} =~ /\b__ILP32__=1\b/ ?
+                       ',u=x32' : ',u=x86';
        }
        eval { require PublicInbox };
        my $pi_ver = eval('$PublicInbox::VERSION') // '(???)';
-       my $daemon = $lei->{oneshot} ? 'oneshot' : 'daemon';
-       my @out = ("lei $pi_ver mode=$daemon\n",
+       my $nproc = PublicInbox::IPC::detect_nproc() // '?';
+       my @out = ("lei $pi_ver\n",
                "perl $Config{version} / $os $rel / $mac ".
-               "ptrsize=$Config{ptrsize}\n");
+               "ptrsize=$Config{ptrsize} nproc=$nproc\n");
        chomp(my $gv = `git --version` || "git missing");
        $gv =~ s/ version / /;
        my $json = ref(PublicInbox::Config->json);
@@ -41,7 +42,8 @@ sub lei_sucks {
        } else {
                push @out, "Unable to load DBI / DBD::SQLite: $@\n";
        }
-       if (PublicInbox::Search::load_xapian()) {
+       if (eval { require PublicInbox::Search } &&
+                       PublicInbox::Search::load_xapian()) {
                push @out, 'Xapian '.
                        join('.', map {
                                $PublicInbox::Search::Xap->can($_)->();
@@ -55,7 +57,7 @@ sub lei_sucks {
        my $dig = Digest::SHA->new(1);
        push @out, "public-inbox blob OIDs of loaded features:\n";
        for my $m (grep(m{^PublicInbox/}, sort keys %INC)) {
-               my $f = $INC{$m};
+               my $f = $INC{$m} // next; # lazy require failed (missing dep)
                $dig->add('blob '.(-s $f)."\0");
                $dig->addfile($f);
                push @out, '  '.$dig->hexdigest.' '.$m."\n";