lib/PublicInbox/LeiAuth.pm | 3 ++- lib/PublicInbox/LeiExportKw.pm | 3 --- lib/PublicInbox/LeiImport.pm | 2 -- lib/PublicInbox/LeiIndex.pm | 2 -- lib/PublicInbox/LeiLsMailSource.pm | 1 - lib/PublicInbox/LeiPruneMailSync.pm | 1 - lib/PublicInbox/LeiRediff.pm | 1 - lib/PublicInbox/LeiRm.pm | 1 - lib/PublicInbox/LeiTag.pm | 1 - lib/PublicInbox/LeiToMail.pm | 2 -- diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm index 73c0be599fc72a17b4c359015d42cd6fe8f75161..465a2758466851321c996189f79c30a22b06746d 100644 --- a/lib/PublicInbox/LeiAuth.pm +++ b/lib/PublicInbox/LeiAuth.pm @@ -49,9 +49,10 @@ %$net = (%$net, %$net_new); } # 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 + $wq->wq_broadcast('PublicInbox::LeiAuth::net_merge_all', $net_new); $wq->net_merge_all_done; # defined per-WQ } diff --git a/lib/PublicInbox/LeiExportKw.pm b/lib/PublicInbox/LeiExportKw.pm index 78c6c6f95ff36b36c44c90096c87aeace7109e79..d37f3768202619d434060981580ae27b0d2a76e0 100644 --- a/lib/PublicInbox/LeiExportKw.pm +++ b/lib/PublicInbox/LeiExportKw.pm @@ -145,7 +145,4 @@ *ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child; *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done; -# the following works even when LeiAuth is lazy-loaded -*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all; - 1; diff --git a/lib/PublicInbox/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index 7580e37e3674a2a0ab1a02a9213d981e80b22315..7c563bd8c8e79e864325cd0833e88d59406a120e 100644 --- a/lib/PublicInbox/LeiImport.pm +++ b/lib/PublicInbox/LeiImport.pm @@ -133,6 +133,4 @@ no warnings 'once'; *ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child; *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done; -# the following works even when LeiAuth is lazy-loaded -*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all; 1; diff --git a/lib/PublicInbox/LeiIndex.pm b/lib/PublicInbox/LeiIndex.pm index ef3e4d0b299af603b806d84d11e6c36217ecc423..1b327a2c1bc81904928e818893c8c929abac0fee 100644 --- a/lib/PublicInbox/LeiIndex.pm +++ b/lib/PublicInbox/LeiIndex.pm @@ -43,6 +43,4 @@ *_complete_index = \&PublicInbox::LeiImport::_complete_import; *ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child; *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done; -# the following works even when LeiAuth is lazy-loaded -*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all; 1; diff --git a/lib/PublicInbox/LeiLsMailSource.pm b/lib/PublicInbox/LeiLsMailSource.pm index 2d8913ac9f090adf1af6ccd6148860be0fed32e3..71e253d9c476c954f8f68b86eeb29adcefdba95c 100644 --- a/lib/PublicInbox/LeiLsMailSource.pm +++ b/lib/PublicInbox/LeiLsMailSource.pm @@ -114,6 +114,5 @@ no warnings 'once'; *ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child; *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done; -*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all; 1; diff --git a/lib/PublicInbox/LeiPruneMailSync.pm b/lib/PublicInbox/LeiPruneMailSync.pm index 98239a139762fe0adbf6e423ba3cfb5a9a5a5e2e..1a277122370bd634c5145ba6912d165ee027e1e9 100644 --- a/lib/PublicInbox/LeiPruneMailSync.pm +++ b/lib/PublicInbox/LeiPruneMailSync.pm @@ -91,7 +91,6 @@ no warnings 'once'; *_complete_prune_mail_sync = \&PublicInbox::LeiExportKw::_complete_export_kw; *ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child; -*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all; *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done; 1; diff --git a/lib/PublicInbox/LeiRediff.pm b/lib/PublicInbox/LeiRediff.pm index 60286b065359430a1d6809ac073bea0482433428..ea9b2a643f9a0bb1334bdedca0c899e6840a3f35 100644 --- a/lib/PublicInbox/LeiRediff.pm +++ b/lib/PublicInbox/LeiRediff.pm @@ -255,5 +255,4 @@ } no warnings 'once'; *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done; -*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all; 1; diff --git a/lib/PublicInbox/LeiRm.pm b/lib/PublicInbox/LeiRm.pm index 578e9811495080f2d620bcb52e0900db2331152c..778fa1de92763a14e49ff2e917048ecc86bb2a37 100644 --- a/lib/PublicInbox/LeiRm.pm +++ b/lib/PublicInbox/LeiRm.pm @@ -44,6 +44,5 @@ no warnings 'once'; *ipc_atfork_child = \&PublicInbox::LeiInput::input_only_atfork_child; *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done; -*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all; 1; diff --git a/lib/PublicInbox/LeiTag.pm b/lib/PublicInbox/LeiTag.pm index 463fb9219749c0eb1b2f7b8860c23bb4fd3b3d96..44d77b881c04136c1f190e3e166298e100fd101c 100644 --- a/lib/PublicInbox/LeiTag.pm +++ b/lib/PublicInbox/LeiTag.pm @@ -118,7 +118,6 @@ } grep(/$re\Q$cur/, @all); } no warnings 'once'; # the following works even when LeiAuth is lazy-loaded -*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all; *net_merge_all_done = \&PublicInbox::LeiInput::input_only_net_merge_all_done; 1; diff --git a/lib/PublicInbox/LeiToMail.pm b/lib/PublicInbox/LeiToMail.pm index 1221d3c77e1f6a7d521017d7414a44780763bf78..2c7a92de2130ff232c6f5580dbf87524ac5db003 100644 --- a/lib/PublicInbox/LeiToMail.pm +++ b/lib/PublicInbox/LeiToMail.pm @@ -783,6 +783,4 @@ $self->wq_broadcast('do_post_auth'); $self->wq_close(1); } -no warnings 'once'; # the following works even when LeiAuth is lazy-loaded -*net_merge_all = \&PublicInbox::LeiAuth::net_merge_all; 1;