imap+nntp: share COMPRESS implementation

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

diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm
index 3155d79b1c9de853b12b05cb4a688005caf37b6c..9b09cecf05cb1f6b54a86720cf695d34d0b75f07 100644 (file)
--- a/lib/PublicInbox/LeiAuth.pm
+++ b/lib/PublicInbox/LeiAuth.pm
@@ -20,12 +20,7 @@
 # broadcast net_merge_all [ all workers (including LeiAuth worker #0) ]
 #                         [ LeiAuth worker #0 becomes just another WQ worker ]
 #                         |
-#                         | each worker sends net_merge_done1 to lei-daemon
-#                         |              |  | ... |
-#                         |              v  v     v
-# recv net_merge_done1 <--<-------<------/--/--<--/
-#
-# call net_merge_all_done ->-> do per-class defined actions
+# call net_merge_all_done ->-> do per-WQ-class defined actions
 package PublicInbox::LeiAuth;
 use strict;
 use v5.10.1;
@@ -35,10 +30,16 @@ sub do_auth_atfork { # used by IPC WQ workers
        return if $wq->{-wq_worker_nr} != 0; # only first worker calls this
        my $lei = $wq->{lei};
        my $net = $lei->{net};
+       if ($net->{-auth_done}) { # from previous worker... (ugly)
+               $lei->{pkt_op_p}->pkt_do('net_merge_continue', $net) or
+                               $lei->fail("pkt_do net_merge_continue: $!");
+               return;
+       }
        eval { # fill auth info (may prompt user or read netrc)
                my $mics = $net->imap_common_init($lei);
                my $nn = $net->nntp_common_init($lei);
                # broadcast successful auth info to lei-daemon:
+               $net->{-auth_done} = 1;
                $lei->{pkt_op_p}->pkt_do('net_merge_continue', $net) or
                                die "pkt_do net_merge_continue: $!";
                $net->{mics_cached} = $mics if $mics;
@@ -47,31 +48,24 @@ sub do_auth_atfork { # used by IPC WQ workers
        $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_all_done; # defined per wq-class (e.g. LeiImport)
-}
-
 sub net_merge_all { # called in wq worker via wq_broadcast
        my ($wq, $net_new) = @_;
        my $net = $wq->{lei}->{net};
        %$net = (%$net, %$net_new);
-       # notify daemon we're ready
-       $wq->{lei}->{pkt_op_p}->pkt_do('net_merge_done1') or
-               die "pkt_op_do net_merge_done1: $!";
 }
 
 # called by top-level lei-daemon when first worker is done with auth
+# passes updated net auth info to current workers
 sub net_merge_continue {
-       my ($wq, $net_new) = @_;
-       $wq->wq_broadcast('net_merge_all', $net_new); # pass to current workers
+       my ($wq, $lei, $net_new) = @_;
+       $wq->{-net_new} = $net_new; # for "lei up"
+       $wq->wq_broadcast('PublicInbox::LeiAuth::net_merge_all', $net_new);
+       $wq->net_merge_all_done($lei); # defined per-WQ
 }
 
 sub op_merge { # prepares PktOp->pair ops
-       my ($self, $ops, $wq) = @_;
-       $ops->{net_merge_continue} = [ \&net_merge_continue, $wq ];
-       $ops->{net_merge_done1} = [ \&net_merge_done1, $wq ];
+       my ($self, $ops, $wq, $lei) = @_;
+       $ops->{net_merge_continue} = [ \&net_merge_continue, $wq, $lei ];
 }
 
 sub new { bless \(my $x), __PACKAGE__ }