inbox: name variable for values loop iterator

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 02186dac717fa329b6fb508d8eeab2c18919bca0..e9efd29d40a4b46f993bef2075653f632cb43544 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -31,7 +31,7 @@ sub cleanup_task () {
        for my $ibx (values %$CLEANUP) {
                my $again;
                if ($have_devel_peek) {
-                       foreach my $f (qw(mm search)) {
+                       foreach my $f (qw(search)) {
                                # we bump refcnt by assigning tmp, here:
                                my $tmp = $ibx->{$f} or next;
                                next if Devel::Peek::SvREFCNT($tmp) > 2;
@@ -47,7 +47,7 @@ sub cleanup_task () {
                }
                check_inodes($ibx);
                if ($have_devel_peek) {
-                       $again ||= !!($ibx->{mm} || $ibx->{search});
+                       $again ||= !!$ibx->{search};
                }
                $next->{"$ibx"} = $ibx if $again;
        }
@@ -70,7 +70,7 @@ sub _cleanup_later ($) {
        my ($self) = @_;
        $cleanup_avail = cleanup_possible() if $cleanup_avail < 0;
        return if $cleanup_avail != 1;
-       $cleanup_timer ||= PublicInbox::DS::later(*cleanup_task);
+       $cleanup_timer //= PublicInbox::DS::later(\&cleanup_task);
        $CLEANUP->{"$self"} = $self;
 }
 
@@ -182,7 +182,6 @@ sub mm {
        my ($self) = @_;
        $self->{mm} ||= eval {
                require PublicInbox::Msgmap;
-               _cleanup_later($self);
                my $dir = $self->{inboxdir};
                if ($self->version >= 2) {
                        PublicInbox::Msgmap->new_file("$dir/msgmap.sqlite3");
@@ -192,24 +191,28 @@ sub mm {
        };
 }
 
-sub search ($;$) {
-       my ($self, $over_only) = @_;
+sub search ($;$$) {
+       my ($self, $over_only, $ctx) = @_;
        my $srch = $self->{search} ||= eval {
                _cleanup_later($self);
                require PublicInbox::Search;
                PublicInbox::Search->new($self);
        };
-       ($over_only || eval { $srch->xdb }) ? $srch : undef;
+       ($over_only || eval { $srch->xdb }) ? $srch : do {
+               $ctx and $ctx->{env}->{'psgi.errors'}->print(<<EOF);
+`$self->{name}' search went away unexpectedly
+EOF
+               undef;
+       };
 }
 
-sub over ($) {
-       my ($self) = @_;
-       my $srch = search($self, 1) or return;
-       $self->{over} ||= eval {
-               my $over = $srch->{over_ro};
-               $over->dbh_new; # may fail
+sub over {
+       $_[0]->{over} //= eval {
+               my $srch = search($_[0], 1) or return;
+               my $over = PublicInbox::Over->new("$srch->{xpfx}/over.sqlite3");
+               $over->dbh; # may fail
                $over;
-       }
+       };
 }
 
 sub try_cat {
@@ -409,7 +412,7 @@ sub unsubscribe_unlock {
 
 sub check_inodes ($) {
        my ($self) = @_;
-       for (qw(over)) { # TODO: search, mm
+       for (qw(over mm)) { # TODO: search
                $self->{$_}->check_inodes if $self->{$_};
        }
 }
@@ -419,8 +422,8 @@ sub on_unlock {
        my ($self) = @_;
        check_inodes($self);
        my $subs = $self->{unlock_subs} or return;
-       for (values %$subs) {
-               eval { $_->on_inbox_unlock($self) };
+       for my $obj (values %$subs) {
+               eval { $obj->on_inbox_unlock($self) };
                warn "E: $@ ($self->{inboxdir})\n" if $@;
        }
 }