PublicInbox::Feed owns `feedmax' default value

[public-inbox.git] / lib / PublicInbox / Inbox.pm

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 5a22e40d086acf5d0b96333aa23a907328a28216..4e3c23f35a4820e96d87cb8f4b2c0f048ef9f5b0 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -74,18 +74,8 @@ sub _cleanup_later ($) {
        $CLEANUP->{"$self"} = $self;
 }
 
-sub _set_uint ($$$) {
-       my ($opts, $field, $default) = @_;
-       my $val = $opts->{$field};
-       if (defined $val) {
-               $val = $val->[-1] if ref($val) eq 'ARRAY';
-               $val = undef if $val !~ /\A[0-9]+\z/;
-       }
-       $opts->{$field} = $val || $default;
-}
-
 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 +86,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 +100,15 @@ 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');
-       _set_uint($opts, 'feedmax', 25);
-       $opts->{nntpserver} ||= $pi_config->{'publicinbox.nntpserver'};
+       my $pi_cfg = delete $opts->{-pi_cfg};
+       _set_limiter($opts, $pi_cfg, 'httpbackend');
+       my $fmax = $opts->{feedmax};
+       if (defined($fmax) && $fmax =~ /\A[0-9]+\z/) {
+               $opts->{feedmax} += 0;
+       } else {
+               delete $opts->{feedmax};
+       }
+       $opts->{nntpserver} ||= $pi_cfg->{'publicinbox.nntpserver'};
        my $dir = $opts->{inboxdir};
        if (defined $dir && -f "$dir/inbox.lock") {
                $opts->{version} = 2;
@@ -191,30 +186,34 @@ sub mm {
        };
 }
 
-sub search ($;$$) {
-       my ($self, $over_only, $ctx) = @_;
-       my $srch = $self->{search} ||= eval {
+sub search {
+       my ($self) = @_;
+       my $srch = $self->{search} //= eval {
                _cleanup_later($self);
                require PublicInbox::Search;
                PublicInbox::Search->new($self);
        };
-       ($over_only || eval { $srch->xdb }) ? $srch : do {
-               $ctx and $ctx->{env}->{'psgi.errors'}->print(<<EOF);
-`$self->{name}' search went away unexpectedly
-EOF
-               undef;
-       };
+       (eval { $srch->xdb }) ? $srch : undef;
 }
 
+# isrch is preferred for read-only interfaces if available since it
+# reduces kernel cache and FD overhead
+sub isrch { $_[0]->{isrch} // search($_[0]) }
+
 sub over {
        $_[0]->{over} //= eval {
-               my $srch = search($_[0], 1) or return;
+               my $srch = $_[0]->{search} //= eval {
+                       _cleanup_later($_[0]);
+                       require PublicInbox::Search;
+                       PublicInbox::Search->new($_[0]);
+               };
                my $over = PublicInbox::Over->new("$srch->{xpfx}/over.sqlite3");
                $over->dbh; # may fail
                $over;
        };
 }
 
+
 sub try_cat {
        my ($path) = @_;
        my $rv = '';