lei q: ensure wq workers shutdown on IMAP auth failures

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

diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm
index 927fe5501edd6a0eaf9deff30faaf73489346d6d..48deca9309353af35488f24d98b1dd457880cdc1 100644 (file)
--- a/lib/PublicInbox/LeiAuth.pm
+++ b/lib/PublicInbox/LeiAuth.pm
@@ -13,12 +13,15 @@ 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);
-       my $nn = $net->nntp_common_init($lei);
-       pkt_do($lei->{pkt_op_p}, 'net_merge', $net) or
-                       die "pkt_do net_merge: $!";
-       $net->{mics_cached} = $mics if $mics;
-       $net->{nn_cached} = $nn if $nn;
+       eval {
+               my $mics = $net->imap_common_init($lei);
+               my $nn = $net->nntp_common_init($lei);
+               pkt_do($lei->{pkt_op_p}, 'net_merge', $net) or
+                               die "pkt_do net_merge: $!";
+               $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