about summary refs log tree commit homepage
path: root/lib/PublicInbox/Inbox.pm
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2020-12-08 21:21:27 +0000
committerEric Wong <e@80x24.org>2020-12-09 21:13:34 +0000
commit0d38f65c490466837ae091afa7a7b6f59d04ce7c (patch)
tree8c838c12ce3c28ef1c15a15dd6584e0d0d831a34 /lib/PublicInbox/Inbox.pm
parent416d1c3f6d5e5a857760ffc1b679e86a070bdbd4 (diff)
downloadpublic-inbox-0d38f65c490466837ae091afa7a7b6f59d04ce7c.tar.gz
{pi_config} may be confused with the documented `PI_CONFIG'
environment variable, and we'll favor vowel-removal to be
consistent with our usage of object references.

The `pi_' prefix may stay in some places, for now; since a
separate namespace may come into this codebase for local/private
client-tooling.

For InboxIdle, we'll also remove an invalid comment about
holding a reference to the PublicInbox::Config object, too.
Diffstat (limited to 'lib/PublicInbox/Inbox.pm')
-rw-r--r--lib/PublicInbox/Inbox.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 52aece7c..586bd561 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -85,7 +85,7 @@ sub _set_uint ($$$) {
 }
 
 sub _set_limiter ($$$) {
-        my ($self, $pi_config, $pfx) = @_;
+        my ($self, $pi_cfg, $pfx) = @_;
         my $lkey = "-${pfx}_limiter";
         $self->{$lkey} ||= do {
                 # full key is: publicinbox.$NAME.httpbackendmax
@@ -96,7 +96,7 @@ sub _set_limiter ($$$) {
                         require PublicInbox::Qspawn;
                         $lim = PublicInbox::Qspawn::Limiter->new($val);
                 } elsif ($val =~ /\A[a-z][a-z0-9]*\z/) {
-                        $lim = $pi_config->limiter($val);
+                        $lim = $pi_cfg->limiter($val);
                         warn "$mkey limiter=$val not found\n" if !$lim;
                 } else {
                         warn "$mkey limiter=$val not understood\n";
@@ -110,10 +110,10 @@ sub new {
         my $v = $opts->{address} ||= [ 'public-inbox@example.com' ];
         my $p = $opts->{-primary_address} = ref($v) eq 'ARRAY' ? $v->[0] : $v;
         $opts->{domain} = ($p =~ /\@(\S+)\z/) ? $1 : 'localhost';
-        my $pi_config = delete $opts->{-pi_config};
-        _set_limiter($opts, $pi_config, 'httpbackend');
+        my $pi_cfg = delete $opts->{-pi_cfg};
+        _set_limiter($opts, $pi_cfg, 'httpbackend');
         _set_uint($opts, 'feedmax', 25);
-        $opts->{nntpserver} ||= $pi_config->{'publicinbox.nntpserver'};
+        $opts->{nntpserver} ||= $pi_cfg->{'publicinbox.nntpserver'};
         my $dir = $opts->{inboxdir};
         if (defined $dir && -f "$dir/inbox.lock") {
                 $opts->{version} = 2;