treewide: update to v3 Tor onions

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

diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm
index 099bdaca2a1fc454dc3770064c4d8ede7b7a38d4..877ae6a3c081b7bb4d1409f6ef831470a5946d3e 100644 (file)
--- a/lib/PublicInbox/LeiAuth.pm
+++ b/lib/PublicInbox/LeiAuth.pm
@@ -13,16 +13,21 @@ sub do_auth_atfork { # used by IPC WQ workers
        return if $wq->{-wq_worker_nr} != 0;
        my $lei = $wq->{lei};
        my $net = $lei->{net};
-       my $mics = $net->imap_common_init($lei);
-       pkt_do($lei->{pkt_op_p}, 'net_merge', $net) or
-                       die "pkt_do net_merge: $!";
-       $net->{mics_cached} = $mics;
+       eval {
+               my $mics = $net->imap_common_init($lei);
+               my $nn = $net->nntp_common_init($lei);
+               pkt_do($lei->{pkt_op_p}, 'net_merge_continue', $net) or
+                               die "pkt_do net_merge_continue: $!";
+               $net->{mics_cached} = $mics if $mics;
+               $net->{nn_cached} = $nn if $nn;
+       };
+       $lei->fail($@) if $@;
 }
 
 sub net_merge_done1 { # bump merge-count in top-level lei-daemon
        my ($wq) = @_;
        return if ++$wq->{nr_net_merge_done} != $wq->{-wq_nr_workers};
-       $wq->net_merge_complete; # defined per wq-class (e.g. LeiImport)
+       $wq->net_merge_all_done; # defined per wq-class (e.g. LeiImport)
 }
 
 sub net_merge_all { # called in wq worker via wq_broadcast
@@ -41,7 +46,7 @@ sub net_merge_continue {
 
 sub op_merge { # prepares PktOp->pair ops
        my ($self, $ops, $wq) = @_;
-       $ops->{net_merge} = [ \&net_merge_continue, $wq ];
+       $ops->{net_merge_continue} = [ \&net_merge_continue, $wq ];
        $ops->{net_merge_done1} = [ \&net_merge_done1, $wq ];
 }