ds: share long_step between NNTP and IMAP

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

diff --git a/lib/PublicInbox/ManifestJsGz.pm b/lib/PublicInbox/ManifestJsGz.pm
index 69d81fa1ace13dc634625e86abd4c15935c57230..d5048a96de45da8589cc659fff787588a941c64a 100644 (file)
--- a/lib/PublicInbox/ManifestJsGz.pm
+++ b/lib/PublicInbox/ManifestJsGz.pm
@@ -27,7 +27,7 @@ sub inject_entry ($$$;$) {
        $ctx->{manifest}->{$url_path} = $ent;
 }
 
-sub manifest_add ($$;$$) { # slow path w/o extindex "all"
+sub manifest_add ($$;$$) { # slow path w/o extindex "all" (or per-inbox)
        my ($ctx, $ibx, $epoch, $default_desc) = @_;
        my $url_path = "/$ibx->{name}";
        my $git;
@@ -53,6 +53,7 @@ sub slow_manifest_add ($$) {
                        manifest_add($ctx, $ibx);
                }
        };
+       warn "E: $@" if $@;
 }
 
 sub eidx_manifest_add ($$$) {
@@ -65,6 +66,10 @@ sub eidx_manifest_add ($$$) {
                }
        } else {
                warn "E: `${\$ibx->eidx_key}' not indexed by $ALL->{topdir}\n";
+               # do not use slow path for global manifest since
+               # it can become catastrophically slow.  per-inbox manifest
+               # is not too bad with dozens of epochs, so never fail that:
+               slow_manifest_add($ctx, $ibx) if $ibx == $ctx->{ibx};
        }
 }
 
@@ -85,12 +90,8 @@ sub response {
 sub ibx_entry {
        my ($ctx, $ibx) = @_;
        my $ALL = $ctx->{www}->{pi_cfg}->ALL;
-       if ($ALL) { # FIXME: test this in t/
-               eidx_manifest_add($ctx, $ALL, $ibx);
-       } else {
+       $ALL ? eidx_manifest_add($ctx, $ALL, $ibx) :
                slow_manifest_add($ctx, $ibx);
-               warn "E: $@" if $@;
-       }
 }
 
 sub hide_key { 'manifest' } # for WwwListing->list_match_i
@@ -112,8 +113,7 @@ sub psgi_triple {
 
 sub per_inbox {
        my ($ctx) = @_;
-       # only one inbox, slow is probably OK
-       slow_manifest_add($ctx, $ctx->{ibx});
+       ibx_entry($ctx, $ctx->{ibx});
        psgi_triple($ctx);
 }