imap+nntp: die loudly if ->mm or ->over disappear

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

diff --git a/lib/PublicInbox/Inbox.pm b/lib/PublicInbox/Inbox.pm
index da7ea75f1a5741c7702aa0a85466ee908b9f019b..df140cacbec177191839a7ffd310b132e11c566e 100644 (file)
--- a/lib/PublicInbox/Inbox.pm
+++ b/lib/PublicInbox/Inbox.pm
@@ -8,6 +8,7 @@ use PublicInbox::Git;
 use PublicInbox::MID qw(mid2path);
 use PublicInbox::Eml;
 use List::Util qw(max);
+use Carp qw(croak);
 
 # Long-running "git-cat-file --batch" processes won't notice
 # unlinked packs, so we need to restart those processes occasionally.
@@ -168,8 +169,8 @@ sub max_git_epoch {
 }
 
 sub mm {
-       my ($self) = @_;
-       $self->{mm} ||= eval {
+       my ($self, $req) = @_;
+       $self->{mm} //= eval {
                require PublicInbox::Msgmap;
                my $dir = $self->{inboxdir};
                if ($self->version >= 2) {
@@ -177,7 +178,7 @@ sub mm {
                } else {
                        PublicInbox::Msgmap->new($dir);
                }
-       };
+       } // ($req ? croak("E: $@") : undef);
 }
 
 sub search {
@@ -195,19 +196,19 @@ sub search {
 sub isrch { $_[0]->{isrch} // search($_[0]) }
 
 sub over {
-       $_[0]->{over} //= eval {
-               my $srch = $_[0]->{search} //= do {
-                       _cleanup_later($_[0]);
+       my ($self, $req) = @_;
+       $self->{over} //= eval {
+               my $srch = $self->{search} //= do {
+                       _cleanup_later($self);
                        require PublicInbox::Search;
-                       PublicInbox::Search->new($_[0]);
+                       PublicInbox::Search->new($self);
                };
                my $over = PublicInbox::Over->new("$srch->{xpfx}/over.sqlite3");
                $over->dbh; # may fail
                $over;
-       };
+       } // ($req ? croak("E: $@") : undef);
 }
 
-
 sub try_cat {
        my ($path) = @_;
        open(my $fh, '<', $path) or return '';
@@ -241,7 +242,7 @@ sub cloneurl {
 
 sub base_url {
        my ($self, $env) = @_; # env - PSGI env
-       if ($env) {
+       if ($env && $env->{'psgi.url_scheme'}) {
                my $url = PublicInbox::Git::host_prefix_url($env, '');
                # for mount in Plack::Builder
                $url .= '/' if $url !~ m!/\z!;