From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 01/10] lei_auth: rename {nrd} field to {net} for clarity
Date: Mon, 22 Feb 2021 08:22:50 -0300 [thread overview]
Message-ID: <20210222112259.32402-1-e@80x24.org> (raw)
In-Reply-To: <20210222112155.32231-1-e@80x24.org>
We're authing for both reads and writes, this makes it
clear that we support both NetReader and NetWriter.
---
lib/PublicInbox/LeiAuth.pm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/lib/PublicInbox/LeiAuth.pm b/lib/PublicInbox/LeiAuth.pm
index bf0110ed..c70d8e8f 100644
--- a/lib/PublicInbox/LeiAuth.pm
+++ b/lib/PublicInbox/LeiAuth.pm
@@ -10,22 +10,22 @@ use parent qw(PublicInbox::IPC);
use PublicInbox::PktOp qw(pkt_do);
use PublicInbox::NetReader;
-sub nrd_merge {
- my ($lei, $nrd_new) = @_;
+sub net_merge {
+ my ($lei, $net_new) = @_;
if ($lei->{pkt_op_p}) { # from lei_convert worker
- pkt_do($lei->{pkt_op_p}, 'nrd_merge', $nrd_new);
+ pkt_do($lei->{pkt_op_p}, 'net_merge', $net_new);
} else { # single lei-daemon consumer
my $self = $lei->{auth} or return; # client disconnected
- my $nrd = $self->{nrd};
- %$nrd = (%$nrd, %$nrd_new);
+ my $net = $self->{net};
+ %$net = (%$net, %$net_new);
}
}
sub do_auth { # called via wq_io_do
my ($self) = @_;
- my ($lei, $nrd) = @$self{qw(lei nrd)};
- $nrd->imap_common_init($lei);
- nrd_merge($lei, $nrd); # tell lei-daemon updated auth info
+ my ($lei, $net) = @$self{qw(lei net)};
+ $net->imap_common_init($lei);
+ net_merge($lei, $net); # tell lei-daemon updated auth info
}
sub do_finish_auth { # dwaitpid callback
@@ -44,7 +44,7 @@ sub auth_start {
my ($self, $lei, $post_auth_cb, @args) = @_;
$lei->_lei_cfg(1); # workers may need to read config
my $op = $lei->workers_start($self, 'auth', 1, {
- 'nrd_merge' => [ \&nrd_merge, $lei ],
+ 'net_merge' => [ \&net_merge, $lei ],
'' => [ \&auth_eof, $lei, $post_auth_cb, @args ],
});
$self->wq_io_do('do_auth', []);
@@ -63,8 +63,8 @@ sub ipc_atfork_child {
}
sub new {
- my ($cls, $nrd) = @_; # nrd may be NetReader or descendant (NetWriter)
- bless { nrd => $nrd }, $cls;
+ my ($cls, $net) = @_; # net may be NetReader or descendant (NetWriter)
+ bless { net => $net }, $cls;
}
1;
next prev parent reply other threads:[~2021-02-22 11:22 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-22 11:21 [PATCH 00/10] lei: avoid wasting IMAP connections Eric Wong
2021-02-22 11:22 ` Eric Wong [this message]
2021-02-22 11:22 ` [PATCH 02/10] lei: keep client {sock} in short-lived workers Eric Wong
2021-02-22 11:22 ` [PATCH 03/10] lei: _lei_cfg: return empty hashref if unconfigured Eric Wong
2021-02-22 11:22 ` [PATCH 04/10] lei convert: auth directly from worker process Eric Wong
2021-02-22 11:22 ` [PATCH 05/10] lei import: no separate auth worker Eric Wong
2021-02-22 11:22 ` [PATCH 06/10] lei_auth: migrate common auth code from lei_import Eric Wong
2021-02-22 11:22 ` [PATCH 07/10] lei q: reduce wasted IMAP connection for auth Eric Wong
2021-02-22 11:22 ` [PATCH 08/10] net_reader: mic_get: reuse connections if cache enabled Eric Wong
2021-02-22 11:22 ` [PATCH 09/10] lei convert: inline convert_start Eric Wong
2021-02-22 11:22 ` [PATCH 10/10] lei_auth: trim and remove leftover worker code 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: https://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=20210222112259.32402-1-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.
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).