lib/PublicInbox/Config.pm | 10 +++++----- lib/PublicInbox/LEI.pm | 2 +- lib/PublicInbox/LeiNoteEvent.pm | 2 +- lib/PublicInbox/LeiUp.pm | 2 +- diff --git a/lib/PublicInbox/Config.pm b/lib/PublicInbox/Config.pm index b3bf5d12c4169ad4344d8ad6fe974582829151d1..d38f65863a49a6f8f01940e0d59dd74cc44dc1d8 100644 --- a/lib/PublicInbox/Config.pm +++ b/lib/PublicInbox/Config.pm @@ -385,10 +385,10 @@ Cwd::abs_path($p); } sub get_1 { - my ($self, $pfx, $k) = @_; - my $v = $self->{"$pfx.$k"} // return; + my ($self, $key) = @_; + my $v = $self->{$key}; return $v if !ref($v); - warn "W: $pfx.$k has multiple values, only using `$v->[-1]'\n"; + warn "W: $key has multiple values, only using `$v->[-1]'\n"; $v->[-1]; } @@ -430,7 +430,7 @@ $ibx->{$k} = $v if defined $v; } for my $k (qw(filter inboxdir newsgroup replyto httpbackendmax feedmax indexlevel indexsequentialshard boost)) { - my $v = get_1($self, $pfx, $k) // next; + my $v = get_1($self, "$pfx.$k") // next; $ibx->{$k} = $v; } @@ -523,7 +523,7 @@ return; } my $es = PublicInbox::ExtSearch->new($d); for my $k (qw(indexlevel indexsequentialshard)) { - my $v = get_1($self, $pfx, $k) // next; + my $v = get_1($self, "$pfx.$k") // next; $es->{$k} = $v; } for my $k (qw(coderepo hide url infourl)) { diff --git a/lib/PublicInbox/LEI.pm b/lib/PublicInbox/LEI.pm index b8159cba29229e1dfecd038f6d33d3874b8227bd..df0bfab6dfb75064f8917fece47aed7650eb189d 100644 --- a/lib/PublicInbox/LEI.pm +++ b/lib/PublicInbox/LEI.pm @@ -1425,7 +1425,7 @@ my $url = substr($w, length('watch.'), -length('.state')); require PublicInbox::LeiWatch; $watches->{$url} //= PublicInbox::LeiWatch->new($url); $seen{$url} = undef; - my $state = $cfg->get_1("watch.$url", 'state'); + my $state = $cfg->get_1("watch.$url.state"); if (!watch_state_ok($state)) { $lei->err("watch.$url.state=$state not supported"); next; diff --git a/lib/PublicInbox/LeiNoteEvent.pm b/lib/PublicInbox/LeiNoteEvent.pm index 2a7b52c1348735bb2765b56670b36f803fda2e1e..1b714dae439326b5450ab8253855d484aff7a06f 100644 --- a/lib/PublicInbox/LeiNoteEvent.pm +++ b/lib/PublicInbox/LeiNoteEvent.pm @@ -73,7 +73,7 @@ $lms->lms_write_prepare if $new_cur eq ''; # for ->clear_src below $lei->{opt}->{quiet} = 1; eval { $lms->arg2folder($lei, [ $folder ]) }; return if $@; - my $state = $cfg->get_1("watch.$folder", 'state') // 'tag-rw'; + my $state = $cfg->get_1("watch.$folder.state") // 'tag-rw'; return if $state eq 'pause'; return $lms->clear_src($folder, \$bn) if $new_cur eq ''; $lms->lms_pause; diff --git a/lib/PublicInbox/LeiUp.pm b/lib/PublicInbox/LeiUp.pm index 377a720eaf29202ab82ed87a0a99d70299ea774c..3e1ca21e29e73fa73522bf5cc7d15ce9495b9338 100644 --- a/lib/PublicInbox/LeiUp.pm +++ b/lib/PublicInbox/LeiUp.pm @@ -32,7 +32,7 @@ my $v = $lss->{-cfg}->get_all("lei.q.$k") // next; $lei->{opt}->{$k} //= $v; } for my $k ($lss->BOOL_FIELDS, $lss->SINGLE_FIELDS) { - my $v = $lss->{-cfg}->get_1('lei.q', $k) // next; + my $v = $lss->{-cfg}->get_1("lei.q.$k") // next; $lei->{opt}->{$k} //= $v; } my $o = $lei->{opt}->{output} // '';