X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FInbox.pm;h=e9efd29d40a4b46f993bef2075653f632cb43544;hb=b782533a0413578de4cfd478c67a8e3d9dda0949;hp=267be4e381bad31d3cab4791f9e7c76d053726db;hpb=f06e84220e5566e74c4af675a7afaf1636b024e4;p=public-inbox.git

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index 267be4e3..e9efd29d 100644
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -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;
 }
 
@@ -191,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->connect; # 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 {
@@ -418,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 $@;
 	}
 }