From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/6] lei_auth: rename {net_merge} to {net_merge_continue}
Date: Sat, 3 Apr 2021 02:24:25 +0000 [thread overview]
Message-ID: <20210403022427.2430-5-e@80x24.org> (raw)
In-Reply-To: <20210403022427.2430-1-e@80x24.org>
No reason for the hash key to differ from the subroutine
name, here.
---
lib/PublicInbox/LeiAuth.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm
index 48deca93..e7b26c5f 100644
--- a/lib/PublicInbox/LeiAuth.pm
+++ b/lib/PublicInbox/LeiAuth.pm
@@ -16,8 +16,8 @@ sub do_auth_atfork { # used by IPC WQ workers
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: $!";
+ 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;
};
@@ -46,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 ];
}
next prev parent reply other threads:[~2021-04-03 2:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-03 2:24 [PATCH 0/6] lei auth-related fixes Eric Wong
2021-04-03 2:24 ` [PATCH 1/6] URInntps: add URI 5.08 release note Eric Wong
2021-04-03 2:24 ` [PATCH 2/6] lei q: ensure wq workers shutdown on IMAP auth failures Eric Wong
2021-04-03 2:24 ` [PATCH 3/6] lei tag: fix tagging of IMAP inputs Eric Wong
2021-04-03 2:24 ` Eric Wong [this message]
2021-04-03 2:24 ` [PATCH 5/6] net_reader: fix read-only "lei convert" auth failures Eric Wong
2021-04-03 2:24 ` [PATCH 6/6] xt/lei-auth-fail: test more failure cases Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210403022427.2430-5-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).