X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FLeiSucks.pm;h=8e866fc96655a9dd5a6342de43217da0a57e14f5;hb=23af251dd607c4e75ab1e68063f2c885c48cc035;hp=2ce64d629167294e61256a8f9f02ec66e81bd877;hpb=2021754b745eba39ef83ff11d504c0257f0f8c11;p=public-inbox.git

diff --git a/lib/PublicInbox/LeiSucks.pm b/lib/PublicInbox/LeiSucks.pm
index 2ce64d62..8e866fc9 100644
--- a/lib/PublicInbox/LeiSucks.pm
+++ b/lib/PublicInbox/LeiSucks.pm
@@ -11,7 +11,7 @@ use Digest::SHA ();
 use Config;
 use POSIX ();
 use PublicInbox::Config;
-use PublicInbox::Search;
+use PublicInbox::IPC;
 
 sub lei_sucks {
 	my ($lei, @argv) = @_;
@@ -23,10 +23,10 @@ sub lei_sucks {
 	}
 	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);
@@ -42,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($_)->();
@@ -56,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";