tls: epollbit: account for miscellaneous OpenSSL errors

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

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index c8334645d3cbcff5bf0b290bda75db7bd8113022..b8abfa94bdebb97a7cc48d2fc82465d035777f21 100644 (file)
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -65,28 +65,11 @@ sub nproc_shards ($) {
 
 sub count_shards ($) {
        my ($self) = @_;
-       my $n = 0;
-       my $xpfx = $self->{xpfx};
-
        # always load existing shards in case core count changes:
        # Also, shard count may change while -watch is running
-       # due to "xcpdb --reshard"
-       if (-d $xpfx) {
-               my $XapianDatabase;
-               foreach my $shard (<$xpfx/*>) {
-                       -d $shard && $shard =~ m!/[0-9]+\z! or next;
-                       $XapianDatabase //= do {
-                               require PublicInbox::Search;
-                               PublicInbox::Search::load_xapian();
-                               $PublicInbox::Search::X{Database};
-                       };
-                       eval {
-                               $XapianDatabase->new($shard)->close;
-                               $n++;
-                       };
-               }
-       }
-       $n;
+       my $srch = $self->{ibx}->search or return 0;
+       delete $self->{ibx}->{search};
+       $srch->{nshard} // 0
 }
 
 sub new {
@@ -1284,8 +1267,8 @@ sub xapian_only {
 # public, called by public-inbox-index
 sub index_sync {
        my ($self, $opt) = @_;
-       $opt //= $_[1] //= {};
-       goto \&xapian_only if $opt->{xapian_only};
+       $opt //= {};
+       return xapian_only($self, $opt) if $opt->{xapian_only};
 
        my $pr = $opt->{-progress};
        my $epoch_max;