my ($self, $name) = @_;
$self->{-limiters}->{$name} ||= do {
require PublicInbox::Qspawn;
- my $max;
- # XXX "limiter.<name>.max" was a historical mistake
- foreach my $pfx (qw(publicinboxlimiter limiter)) {
- $max ||= $self->{"$pfx.$name.max"};
- }
+ my $max = $self->{"publicinboxlimiter.$name.max"};
PublicInbox::Qspawn::Limiter->new($max);
};
}
-sub get {
- my ($self, $inbox, $key) = @_;
-
- $self->{"publicinbox.$inbox.$key"};
-}
-
sub config_dir { $ENV{PI_DIR} || "$ENV{HOME}/.public-inbox" }
sub default_file {
my $fh = popen_rd(\@cmd) or die "popen_rd failed for $file: $!\n";
my %rv;
local $/ = "\n";
- foreach my $line (<$fh>) {
+ while (defined(my $line = <$fh>)) {
chomp $line;
my ($k, $v) = split(/=/, $line, 2);
my $cur = $rv{$k};
my ($self, $pfx) = @_;
my $rv = {};
- foreach my $k (qw(mainrepo address filter url newsgroup
- infourl watch watchheader httpbackendmax)) {
+ foreach my $k (qw(mainrepo filter url newsgroup
+ infourl watch watchheader httpbackendmax
+ replyto feedmax nntpserver)) {
my $v = $self->{"$pfx.$k"};
$rv->{$k} = $v if defined $v;
}
+ foreach my $k (qw(obfuscate)) {
+ my $v = $self->{"$pfx.$k"};
+ defined $v or next;
+ if ($v =~ /\A(?:false|no|off|0)\z/) {
+ $rv->{$k} = 0;
+ } elsif ($v =~ /\A(?:true|yes|on|1)\z/) {
+ $rv->{$k} = 1;
+ } else {
+ warn "Ignoring $pfx.$k=$v in config, not boolean\n";
+ }
+ }
# TODO: more arrays, we should support multi-value for
# more things to encourage decentralization
- foreach my $k (qw(altid nntpmirror)) {
+ foreach my $k (qw(address altid nntpmirror)) {
if (defined(my $v = $self->{"$pfx.$k"})) {
$rv->{$k} = ref($v) eq 'ARRAY' ? $v : [ $v ];
}
$rv->{name} = $name;
$rv->{-pi_config} = $self;
$rv = PublicInbox::Inbox->new($rv);
- my $v = $rv->{address};
- if (ref($v) eq 'ARRAY') {
- $self->{-by_addr}->{lc($_)} = $rv foreach @$v;
- } else {
- $self->{-by_addr}->{lc($v)} = $rv;
- }
+ $self->{-by_addr}->{lc($_)} = $rv foreach @{$rv->{address}};
if (my $ng = $rv->{newsgroup}) {
$self->{-by_newsgroup}->{$ng} = $rv;
}