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;
}
check_inodes($ibx);
if ($have_devel_peek) {
- $again ||= !!($ibx->{mm} || $ibx->{search});
+ $again ||= !!$ibx->{search};
}
$next->{"$ibx"} = $ibx if $again;
}
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;
}
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");
};
}
-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 {
sub check_inodes ($) {
my ($self) = @_;
- for (qw(over)) { # TODO: search, mm
+ for (qw(over mm)) { # TODO: search
$self->{$_}->check_inodes if $self->{$_};
}
}
}
}
+sub uidvalidity { $_[0]->{uidvalidity} //= $_[0]->mm->created_at }
+
1;