From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id BE6141F9F3 for ; Mon, 6 Sep 2021 12:58:03 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 3/3] lei_auth: simplify users Date: Mon, 6 Sep 2021 12:58:03 +0000 Message-Id: <20210906125803.12264-4-e@80x24.org> In-Reply-To: <20210906125803.12264-1-e@80x24.org> References: <20210906125803.12264-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: There's no need to alias net_merge_all in each WQ class which uses LeiAuth, `$obj->$sub' works even when `$sub' is a fully-qualified subroutine name with `::' in it. perlobj(1) documents it under "Method Call Variations". --- 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 -- 10 files changed, 2 insertions(+), 15 deletions(-) diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm index 73c0be59..465a2758 100644 --- a/lib/PublicInbox/LeiAuth.pm +++ b/lib/PublicInbox/LeiAuth.pm @@ -49,9 +49,10 @@ sub net_merge_all { # called in wq worker via wq_broadcast } # 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 78c6c6f9..d37f3768 100644 --- a/lib/PublicInbox/LeiExportKw.pm +++ b/lib/PublicInbox/LeiExportKw.pm @@ -145,7 +145,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/LeiImport.pm b/lib/PublicInbox/LeiImport.pm index 7580e37e..7c563bd8 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 ef3e4d0b..1b327a2c 100644 --- a/lib/PublicInbox/LeiIndex.pm +++ b/lib/PublicInbox/LeiIndex.pm @@ -43,6 +43,4 @@ for my $m (qw(pmdir_cb input_net_cb)) { *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 2d8913ac..71e253d9 100644 --- a/lib/PublicInbox/LeiLsMailSource.pm +++ b/lib/PublicInbox/LeiLsMailSource.pm @@ -114,6 +114,5 @@ sub _complete_ls_mail_source { 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 98239a13..1a277122 100644 --- a/lib/PublicInbox/LeiPruneMailSync.pm +++ b/lib/PublicInbox/LeiPruneMailSync.pm @@ -91,7 +91,6 @@ EOM 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 60286b06..ea9b2a64 100644 --- a/lib/PublicInbox/LeiRediff.pm +++ b/lib/PublicInbox/LeiRediff.pm @@ -255,5 +255,4 @@ sub ipc_atfork_child { 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 578e9811..778fa1de 100644 --- a/lib/PublicInbox/LeiRm.pm +++ b/lib/PublicInbox/LeiRm.pm @@ -44,6 +44,5 @@ sub lei_rm { 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 463fb921..44d77b88 100644 --- a/lib/PublicInbox/LeiTag.pm +++ b/lib/PublicInbox/LeiTag.pm @@ -118,7 +118,6 @@ sub _complete_tag { } 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 1221d3c7..2c7a92de 100644 --- a/lib/PublicInbox/LeiToMail.pm +++ b/lib/PublicInbox/LeiToMail.pm @@ -783,6 +783,4 @@ sub net_merge_all_done { $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;